]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a48ce37 7560f54)
Merge branch 'ma/up-to-date'
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:08:22 +0000 (17:08 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:08:22 +0000 (17:08 +0900)
commit8e36002adda45a35c6fc4daf81913c3d2102cb59
treee3640ac0242262814f2b2d4c2a01c4332faeb18ctree | snapshot
parenta48ce378585054f2ae3b2f0e18346ab005290524commit | diff
parent7560f547e614244fe1d4648598d4facf7ed33a56commit | diff
Merge branch 'ma/up-to-date'

Message and doc updates.

* ma/up-to-date:
  treewide: correct several "up-to-date" to "up to date"
  Documentation/user-manual: update outdated example output
Documentation/git-merge.txt diff1 | diff2 | blob | history
Documentation/githooks.txt diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
git-merge-octopus.sh diff1 | diff2 | blob | history
notes-merge.c diff1 | diff2 | blob | history
remote.c diff1 | diff2 | blob | history
t/t6040-tracking-info.sh diff1 | diff2 | blob | history
unpack-trees.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.