diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:42:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:42:04 -0800 |
| commit | cea20f24738c558d56483402db1ddfebd0362ee4 (patch) | |
| tree | 2d5010857dd1d87b4b5735dea3d423acb68836fb /ll-merge.h | |
| parent | Merge branch 'mh/rebase-fixup' (early part) (diff) | |
| parent | rebase -i --autosquash: auto-squash commits (diff) | |
| download | tgif-cea20f24738c558d56483402db1ddfebd0362ee4.tar.xz | |
Merge branch 'ns/rebase-auto-squash'
* ns/rebase-auto-squash:
rebase -i --autosquash: auto-squash commits
Conflicts:
git-rebase--interactive.sh
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions