summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-17 18:42:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-17 18:42:41 (GMT)
commit8fbb07e3f37ab53febd0b2fc0f64811c68cd2492 (patch)
treea7189a320a7f91d883288dadfd41ce0918e3a37e /Documentation/git-merge-tree.txt
parentc8ccfc9cdf3381525cce718c846bc62fd86767f7 (diff)
parentddeb817f25fea45dee5456c48d723e56b9f8991b (diff)
downloadgit-8fbb07e3f37ab53febd0b2fc0f64811c68cd2492.zip
git-8fbb07e3f37ab53febd0b2fc0f64811c68cd2492.tar.gz
git-8fbb07e3f37ab53febd0b2fc0f64811c68cd2492.tar.bz2
Merge branch 'ta/user-manual'
Update the user's manual to more recent versions of Git. * ta/user-manual: "git prune" is safe Remove irrelevant reference from "Tying it all together" Remove unnecessary historical note from "Object storage format" Improve section "Merging multiple trees" Improve section "Manipulating branches" Simplify "How to make a commit" Fix some typos and improve wording Use "git merge" instead of "git pull ." Use current output for "git repack" Use current "detached HEAD" message Call it "Git User Manual" and remove reference to very old Git version
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions