summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-27 14:01:43 -0800
committerJunio C Hamano <gitster@pobox.com>2014-02-27 14:01:43 -0800
commitd8a1bac1d49dfe8879000e2bd07d138d3088f5b4 (patch)
tree653472a67905cd986e426f3149d0996dff6262b1 /git-rebase--merge.sh
parentbd62e7c364fcce7f42862e3aebedffb1c7e24136 (diff)
parent246090a5d0ff3a51df8fed676e8159c3776c954a (diff)
downloadgit-d8a1bac1d49dfe8879000e2bd07d138d3088f5b4.tar.gz
Merge branch 'al/docs'
A handful of documentation updates, all trivially harmless. * al/docs: docs/git-blame: explain more clearly the example pickaxe use docs/git-clone: clarify use of --no-hardlinks option docs/git-remote: capitalize first word of initial blurb docs/merge-strategies: remove hyphen from mis-merges
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions