summaryrefslogtreecommitdiff
path: root/mergesort.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-07 06:05:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-07 06:05:29 (GMT)
commita1e19004e11dcbc0ceebd92c425ceb1770e52d0b (patch)
treed3d2ab651aaa2766c84b7b971d78ec47ea2403d2 /mergesort.h
parentd219b7f3f97ddbea883af228b9f2d845c9c1d390 (diff)
parentc801170b0cbc3fdd44331a53c2b7649687625680 (diff)
downloadgit-a1e19004e11dcbc0ceebd92c425ceb1770e52d0b.zip
git-a1e19004e11dcbc0ceebd92c425ceb1770e52d0b.tar.gz
git-a1e19004e11dcbc0ceebd92c425ceb1770e52d0b.tar.bz2
Merge branch 'ss/describe-dirty-in-the-right-directory'
"git --work-tree=$there --git-dir=$here describe --dirty" did not work correctly as it did not pay attention to the location of the worktree specified by the user by mistake, which has been corrected. * ss/describe-dirty-in-the-right-directory: t6120: test for describe with a bare repository describe: setup working tree for --dirty
Diffstat (limited to 'mergesort.h')
0 files changed, 0 insertions, 0 deletions