summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-10 12:30:43 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-10 12:30:43 -0800
commit48cbf915a4738097f291de06e23d293f79ff3f9e (patch)
treeca9b4a0f606900e8536e704508fd318d7514d2f0 /git-mergetool--lib.sh
parent25dfd1b925f51a88b00cf0c84c690d448395c30f (diff)
parent9f67d2e8279e1885ef2b4681c19cef8534259783 (diff)
downloadgit-48cbf915a4738097f291de06e23d293f79ff3f9e.tar.gz
Merge branch 'jp/dirty-describe'
* jp/dirty-describe: Teach "git describe" --dirty option
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions