diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-11 12:09:12 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-11 12:09:12 -0700 |
commit | 3e08f5db65bcfe3ad238ee0de1cac2da84953cf3 (patch) | |
tree | ce9480bd5f59c93ed232a94e58f99e5f1c59940b /t/t6010-merge-base.sh | |
parent | Merge branch 'maint-1.5.4' into maint (diff) | |
parent | wt-status.h: declare global variables as extern (diff) | |
download | tgif-3e08f5db65bcfe3ad238ee0de1cac2da84953cf3.tar.xz |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
wt-status.h: declare global variables as extern
builtin-commit.c: add -u as short name for --untracked-files
git-repack: re-enable parsing of -n command line option
Diffstat (limited to 't/t6010-merge-base.sh')
0 files changed, 0 insertions, 0 deletions