summaryrefslogtreecommitdiff
path: root/Documentation/howto/use-git-daemon.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-01 13:28:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-01 13:28:01 -0700
commit4336b53c66bf6b1de061ef38c5d281544261dc3e (patch)
tree3980ddb3216b70bf72286f652e8f22f50aa4d747 /Documentation/howto/use-git-daemon.txt
parentMerge branch 'mm/levenstein-penalize-deletion-less' (diff)
parentDo not autosquash in case of an implied interactive rebase (diff)
downloadtgif-4336b53c66bf6b1de061ef38c5d281544261dc3e.tar.xz
Merge branch 'vr/rebase-autosquash-does-not-imply-i'
"git rebase -p" used to pay attention to rebase.autosquash which was wrong. "git rebase -p -i" should, but "git rebase -p" by itself should not. By Vincent van Ravesteijn * vr/rebase-autosquash-does-not-imply-i: Do not autosquash in case of an implied interactive rebase
Diffstat (limited to 'Documentation/howto/use-git-daemon.txt')
0 files changed, 0 insertions, 0 deletions