git/git-rebase.sh, branch v1.7.2

rebase: improve error message when upstream argument is missing

2010-06-01T00:53:23Z

Strip out options before checking for a missing upstream argument. Before: $ git rebase -m shift: 426: can't shift that many After: $ git rebase -m Usage: git rebase ... While at it, fix the usage message to explain that the upstream argument is mandatory. Reported-by: Jon Dowland Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'mb/rebase-i-no-ff'

2010-04-03T19:28:44Z

* mb/rebase-i-no-ff: Teach rebase the --no-ff option. Conflicts: git-rebase--interactive.sh t/t3404-rebase-interactive.sh

Merge branch 'tr/notes-display'

2010-03-24T23:26:43Z

* tr/notes-display: git-notes(1): add a section about the meaning of history notes: track whether notes_trees were changed at all notes: add shorthand --ref to override GIT_NOTES_REF commit --amend: copy notes to the new commit rebase: support automatic notes copying notes: implement helpers needed for note copying during rewrite notes: implement 'git notes copy --stdin' rebase -i: invoke post-rewrite hook rebase: invoke post-rewrite hook commit --amend: invoke post-rewrite hook Documentation: document post-rewrite hook Support showing notes from more than one notes tree test-lib: unset GIT_NOTES_REF to stop it from influencing tests Conflicts: git-am.sh refs.c

Teach rebase the --no-ff option.

2010-03-24T21:42:57Z

For git-rebase.sh, --no-ff is a synonym for --force-rebase. For git-rebase--interactive.sh, --no-ff cherry-picks all the commits in the rebased branch, instead of fast-forwarding over any unchanged commits. --no-ff offers an alternative way to deal with reverted merges. Instead of "reverting the revert" you can use "rebase --no-ff" to recreate the branch with entirely new commits (they're new because at the very least the committer time is different). This obviates the need to revert the reversion, as you can re-merge the new topic branch directly. Added an addendum to revert-a-faulty-merge.txt describing the situation and how to use --no-ff to handle it. Signed-off-by: Marc Branchaud Signed-off-by: Junio C Hamano

rebase: support automatic notes copying

2010-03-13T05:55:40Z

Luckily, all the support already happens to be there. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

rebase: invoke post-rewrite hook

2010-03-13T05:55:39Z

We have to deal with two separate code paths: a normal rebase, which actually goes through git-am; and rebase {-m|-s}. The only small issue with both is that they need to remember the original sha1 across a possible conflict resolution. rebase -m already puts this information in $dotest/current, and we just introduce a similar file for git-am. Note that in git-am, the hook really only runs when coming from git-rebase: the code path that sets the $dotest/original-commit file is guarded by a test for $dotest/rebasing. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

rebase: don't invoke the pager for each commit summary

2010-01-30T16:42:42Z

This regression was introduced by commit 0aa958d (rebase: replace antiquated sed invocation, 2010-01-24), which changed the invocation of "git rev-list | sed" to "git log". It can be reproduced by something like this: $ git rebase -s recursive origin/master Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano

rebase: replace antiquated sed invocation

2010-01-25T17:43:45Z

Use the modern form of printing a commit subject instead of piping the output of rev-list to sed. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Merge branch 'jc/rerere'

2010-01-19T02:13:01Z

* jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends

Merge branch 'jc/checkout-merge-base'

2010-01-13T20:31:13Z

* jc/checkout-merge-base: rebase -i: teach --onto A...B syntax rebase: fix --onto A...B parsing and add tests "rebase --onto A...B" replays history on the merge base between A and B "checkout A...B" switches to the merge base between A and B