summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 14:42:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 14:42:04 -0800
commitcea20f24738c558d56483402db1ddfebd0362ee4 (patch)
tree2d5010857dd1d87b4b5735dea3d423acb68836fb /git-am.sh
parentMerge branch 'mh/rebase-fixup' (early part) (diff)
parentrebase -i --autosquash: auto-squash commits (diff)
downloadtgif-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 'git-am.sh')
0 files changed, 0 insertions, 0 deletions