]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3bbbf18 187c00c)
Merge branch 'maint-1.8.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Mar 2013 17:51:10 +0000 (10:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Mar 2013 17:51:10 +0000 (10:51 -0700)
commitd011ab4312a8ddabd143567fa9706b8e9fb9c0a4
treea7167cc0ece6125ff59ba1fc6ae78119f863017dtree | snapshot
parent3bbbf18d711eb8fe3390580963c1a071e03cbb38commit | diff
parent187c00c6c58ba8916a37011b56cb0cb8f2dd1805commit | diff
Merge branch 'maint-1.8.1' into maint

* maint-1.8.1:
  merge-tree: fix typo in merge-tree.c::unresolved
  git-commit doc: describe use of multiple `-m` options
  git-pull doc: fix grammo ("conflicts" is plural)
Documentation/git-commit.txt diff1 | diff2 | blob | history
Documentation/git-pull.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.