delta/git.git/git-rebase.sh, branch jk/robustify-parse-commit

Merge branch 'rr/rebase-autostash'

2013-07-31T19:38:29+00:00

* rr/rebase-autostash:
  git-rebase: fix typo

git-rebase: fix typo

2013-07-29T17:32:03+00:00

Signed-off-by: Ralf Thielow 
Signed-off-by: Junio C Hamano

Merge branch 'rr/rebase-reflog-message-reword'

2013-07-18T19:48:20+00:00

"git rebase [-i]" used to leave just "rebase" as its reflog message
for some operations. This rewords them to be more informative.

* rr/rebase-reflog-message-reword:
  rebase -i: use a better reflog message
  rebase: use a better reflog message

Merge branch 'rr/rebase-stash-store'

2013-06-27T21:29:41+00:00

Finishing touches for the "git rebase --autostash" feature
introduced earlier.

* rr/rebase-stash-store:
  rebase: use 'git stash store' to simplify logic
  stash: introduce 'git stash store'
  stash: simplify option parser for create
  stash doc: document short form -p in synopsis
  stash doc: add a warning about using create

Merge branch 'rr/rebase-sha1-by-string-query'

2013-06-24T20:48:40+00:00

Allow various commit objects to be given to "git rebase" by ':/look
for this string' syntax, e.g. "git rebase --onto ':/there'".

* rr/rebase-sha1-by-string-query:
  rebase: use peel_committish() where appropriate
  sh-setup: add new peel_committish() helper
  t/rebase: add failing tests for a peculiar revision

rebase: use a better reflog message

2013-06-24T05:04:43+00:00

Now that the "checkout" invoked internally from "rebase" knows to
honor GIT_REFLOG_ACTION, we can start to use it to write a better
reflog message when "rebase anotherbranch", "rebase --onto branch",
etc. internally checks out the new fork point.  We will write:

  rebase: checkout master

instead of the old

  rebase

Signed-off-by: Ramkumar Ramachandra 
Signed-off-by: Junio C Hamano

rebase: use 'git stash store' to simplify logic

2013-06-17T18:43:24+00:00

rebase has no reason to know about the implementation of the stash.  In
the case when applying the autostash results in conflicts, replace the
relevant code in finish_rebase () to simply call 'git stash store'.

Signed-off-by: Ramkumar Ramachandra 
Signed-off-by: Junio C Hamano

rebase: use peel_committish() where appropriate

2013-06-14T16:41:18+00:00

The revisions specified on the command-line as  and 
arguments could be of the form :/quuxery; so, use peel_committish() to
resolve them.  The failing tests in t/rebase and t/rebase-interactive
now pass.

Signed-off-by: Ramkumar Ramachandra 
Signed-off-by: Junio C Hamano

rebase: finish_rebase() in noop rebase

2013-06-13T22:31:06+00:00

In the following case

  $ git rebase master
  Current branch autostash-fix is up to date.

the autostash is not applied automatically, because this codepath
forgets to call finish_rebase().  Fix this.  Also add a test to guard
against regressions.

Signed-off-by: Ramkumar Ramachandra 
Signed-off-by: Junio C Hamano

rebase: finish_rebase() in fast-forward rebase

2013-06-13T22:30:02+00:00

In the following case

  $ git rebase master
  Fast-forwarded autostash-fix to master.

The autostash is not applied automatically, because this codepath
forgets to call finish_rebase().  Fix this.  Also add a test to guard
against regressions.

Signed-off-by: Ramkumar Ramachandra 
Signed-off-by: Junio C Hamano