Andrew's git / gitweb.git / diff
?
Merge branch 'rj/doc-rev-parse'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Aug 2013 17:08:12 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Aug 2013 17:08:13 +0000 (10:08 -0700)
* rj/doc-rev-parse:
rev-parse(1): logically group options
rev-parse: remove restrictions on some options

1  2 
Documentation/git-rev-parse.txt patch | diff1 | diff2 | blob | history
builtin/rev-parse.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-rev-parse.txt
Simple merge
diff --cc builtin/rev-parse.c
Simple merge