]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a036e4e 76b80cd)
Merge branch 'mm/merge-in-dirty-worktree-doc'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Jun 2013 22:07:43 +0000 (15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Jun 2013 22:07:43 +0000 (15:07 -0700)
commit9a17e9ad15f77b739a33da703f695ad924cd825a
treef2709ce969ea4ee0b87cad88366a69f215f731b1tree | snapshot
parenta036e4ebbf75e7f06fe88d8889f33b84ef5c8b4dcommit | diff
parent76b80cdf17807ba4a773562df2218980ffa27e4fcommit | diff
Merge branch 'mm/merge-in-dirty-worktree-doc'

* mm/merge-in-dirty-worktree-doc:
  Documentation/git-merge.txt: weaken warning about uncommited changes
Documentation/git-merge.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.