diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:39 -0700 |
commit | 78c6e0f3fa41d697f2e01850b0a361e21095545d (patch) | |
tree | 672214a8fa5dfc78e80fae82e856c9f8f2f013f6 /t/t5515/refs.br-unconfig_remote-glob | |
parent | Merge branch 'en/merge-recursive' (diff) | |
parent | rebase: define options in OPTIONS_SPEC (diff) | |
download | tgif-78c6e0f3fa41d697f2e01850b0a361e21095545d.tar.xz |
Merge branch 'mz/rebase'
* mz/rebase: (34 commits)
rebase: define options in OPTIONS_SPEC
Makefile: do not install sourced rebase scripts
rebase: use @{upstream} if no upstream specified
rebase -i: remove unnecessary state rebase-root
rebase -i: don't read unused variable preserve_merges
git-rebase--am: remove unnecessary --3way option
rebase -m: don't print exit code 2 when merge fails
rebase -m: remember allow_rerere_autoupdate option
rebase: remember strategy and strategy options
rebase: remember verbose option
rebase: extract code for writing basic state
rebase: factor out sub command handling
rebase: make -v a tiny bit more verbose
rebase -i: align variable names
rebase: show consistent conflict resolution hint
rebase: extract am code to new source file
rebase: extract merge code to new source file
rebase: remove $branch as synonym for $orig_head
rebase -i: support --stat
rebase: factor out call to pre-rebase hook
...
Diffstat (limited to 't/t5515/refs.br-unconfig_remote-glob')
0 files changed, 0 insertions, 0 deletions