[RFC] git-log should use the same diff-options as git-show

Hi Recently i stumbled upon an old stash entry. It was clear to me that the stash only contained non-indexed worktree changes. So i assumed to get insight by doing $ git log -1 -p stash@{0} But surprisingly the result was "no patch" (The problem which i was not aware at that time was the

protect branches against deletion from remote

Hi, If you try to delete a local branch feature which is not merged into another branch, you will get the following warning: . error: The branch 'feature' is not fully merged. . If you are sure you want to delete it, run 'git branch -D feature'. If a local branch is worth to be protected in

sporadic git failures on interactive rebase

Hi, (git version 2.2.0) I am currently developing/testing a script for a history surgery on a quite big repository (~3 commits). The script always runs against exactly the same copy of a git repository. So things should be reproducable, but sometimes i get failures for the following

filter-branch performance

Hi, i am runningthis command git filter-branch --env-filter 'export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME GIT_COMMITTER_DATE=$GIT_AUTHOR_DATE' --prune-empty --tag-name-filter cat -- --all in a repository which i copied to /dev/shm before. According to

Re: flatten-merge history

Am 26.10.2014 um 06:46 schrieb Christian Couder: Hi,Could you tell us why interactive rebase did not work? First of all i have to admit that i did not i-rebase-merge, but i-rebase-cherrypick. Now i tried it with i-rebase-merge and it didn't work either. Here's my workflow, which i repeated

Re: flatten-merge history

Am 26.10.2014 um 20:02 schrieb Christian Couder: Yeah. Henning, when interactively rebasing, in our editor, you should have something like: pick A pick P pick B pick Q pick C pick D pick R pick E which should work without any conflict. And then you can rebase the b1 and b2 branches on the

flatten-merge history

Hi, suppose the following history P - - - Q - - - - - R -extern A -- - B - - - C - D - - - E -master \ \ M ... \ -b1 \ W ... -b2 Note that master and extern do not have a common parent.

squash commits deep down in history

Hi, i need to squash several commits into a single one in a automated way. I know that there is interactive rebase, which can also be automated using GIT_SEQUENCE_EDITOR. Unfortunately my history is very large and i need to squash deep down in the history several times. So using interactive

Re: squash commits deep down in history

Am 23.10.2014 um 22:08 schrieb Johannes Sixt: Use git-replace do construct a squashed commit that replaces the last child in each run such that its parent points to the parent of the first in the run. Then use a git-filterbranch without filters to burn the parenthood into the history. --