diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:44 -0700 |
| commit | 9234b003726556e0d3d0ea8ade97dc9f7bd50a6e (patch) | |
| tree | 194e8895d8a2e7c7dba0f5e6ab9108231aaae711 /git-merge-one-file.sh | |
| parent | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' (diff) | |
| parent | Teach rebase the --no-ff option. (diff) | |
| download | tgif-9234b003726556e0d3d0ea8ade97dc9f7bd50a6e.tar.xz | |
Merge branch 'mb/rebase-i-no-ff'
* mb/rebase-i-no-ff:
Teach rebase the --no-ff option.
Conflicts:
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions