diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:31:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:31:29 -0700 |
| commit | 45acb7592825b1faa59ea09247bb88b8e91849e3 (patch) | |
| tree | 4a3b906ea88591e7c12a3ed8624f8a8ea88a6def /contrib/completion | |
| parent | 52faa0e8c80ec8351f735c32d858b167d63a0642 (diff) | |
| parent | 587947750bd73544a6a99811f0ddfd64e1ff1445 (diff) | |
| download | git-45acb7592825b1faa59ea09247bb88b8e91849e3.tar.gz | |
Merge branch 'rr/rebase-autostash'
* rr/rebase-autostash:
rebase: implement --[no-]autostash and rebase.autostash
rebase --merge: return control to caller, for housekeeping
rebase -i: return control to caller, for housekeeping
am: return control to caller, for housekeeping
rebase: prepare to do generic housekeeping
rebase -i: don't error out if $state_dir already exists
am: tighten a conditional that checks for $dotest
Diffstat (limited to 'contrib/completion')
0 files changed, 0 insertions, 0 deletions