diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:21 -0700 |
| commit | e31b0183729cab2d6a8e2c76f009017355dacf06 (patch) | |
| tree | f76385fbc62c0bd508891c681594537f378fcf50 /builtin/merge.c | |
| parent | Merge branch 'js/blame-parsename' into maint (diff) | |
| parent | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff (diff) | |
| download | tgif-e31b0183729cab2d6a8e2c76f009017355dacf06.tar.xz | |
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
* aw/maint-rebase-i-p-no-ff:
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions