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 /t/t4117-apply-reject.sh | |
| parent | cc6b41cc7d38c1b2de9809c0995087a2378d27ec (diff) | |
| parent | f59baa502f49c3f1579a82bc37d2bb3ce9e7b5da (diff) | |
| download | git-cea20f24738c558d56483402db1ddfebd0362ee4.tar.gz | |
Merge branch 'ns/rebase-auto-squash'
* ns/rebase-auto-squash:
rebase -i --autosquash: auto-squash commits
Conflicts:
git-rebase--interactive.sh
Diffstat (limited to 't/t4117-apply-reject.sh')
0 files changed, 0 insertions, 0 deletions