summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-10-17 15:55:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-17 15:55:46 -0700
commit8ead1bfe111085ef1ad7759e67340f074996b244 (patch)
tree3661c4d9524fc3be83c6eb2b242495785f08ecc1 /notes-merge.c
parentGit 1.8.0-rc3 (diff)
parentgit-gui 0.17 (diff)
downloadtgif-8ead1bfe111085ef1ad7759e67340f074996b244.tar.xz
Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
git-gui 0.17.0 * tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui: git-gui 0.17 git-gui: Don't prepend the prefix if value looks like a full path git-gui: Detect full path when parsing arguments git-gui: remove .git/CHERRY_PICK_HEAD after committing git-gui: Fix a loose/lose mistake git-gui: Fix semi-working shortcuts for unstage and revert git-gui: de.po: translate "remote" as "extern" git-gui: de.po: translate "bare" as "bloß" git-gui: de.po: consistently add untranslated hook names within braces git-gui: preserve commit messages in utf-8 git-gui: open console when using --trace on windows git-gui: fix a typo in po/ files git-gui: Use PWD if it exists on Mac OS X git-gui: fix git-gui crash due to uninitialized variable
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions