diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-20 15:45:35 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-20 15:45:35 -0700 |
commit | adc7052bb6e737cec0c6702f8dde259540eab672 (patch) | |
tree | 9a3bfa9ff1389908213adcbddedfa09bf8b88c7b /parse-options.c | |
parent | Merge git://github.com/git-l10n/git-po (diff) | |
parent | Consistently use "superproject" instead of "supermodule" (diff) | |
download | tgif-adc7052bb6e737cec0c6702f8dde259540eab672.tar.xz |
Merge branch 'maint'
By Jens Lehmann (1) and Johannes Sixt (1)
* maint:
Consistently use "superproject" instead of "supermodule"
t3404: begin "exchange commits with -p" test with correct preconditions
Diffstat (limited to 'parse-options.c')
0 files changed, 0 insertions, 0 deletions