summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-26 20:46:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-26 20:46:09 (GMT)
commitea0e524ebd60f87546a9998e447d307d3f51a3e3 (patch)
treea0666d93f89e9cf6ef4bd604cf6c049007173a1f /userdiff.h
parentad1c66033e7fa8166825662a56793abedf917d73 (diff)
parent17f9836c8afc8d4b6d6bb91fd0658df090d75c8f (diff)
downloadgit-ea0e524ebd60f87546a9998e447d307d3f51a3e3.zip
git-ea0e524ebd60f87546a9998e447d307d3f51a3e3.tar.gz
git-ea0e524ebd60f87546a9998e447d307d3f51a3e3.tar.bz2
Merge early parts from git://ozlabs.org/~paulus/gitk.git
* master~2: gitk: Show staged submodules regardless of ignore config gitk: Allow displaying time zones from author and commit dates timestamps gitk: Switch to patch mode when searching for line origin gitk: Replace SHA1 entry field on keyboard paste l10n: Init Vietnamese translation
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions