summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-02-02mergetool--lib: list user configured tools in '--tool-help'Libravatar John Keeping1-1/+40
2013-02-02mergetool--lib: add functions for finding available toolsLibravatar David Aguilar1-36/+65
2013-01-29mergetool--lib: improve the help text in guess_merge_tool()Libravatar David Aguilar1-1/+7
2013-01-29mergetool--lib: simplify command expressionsLibravatar David Aguilar1-23/+15
2013-01-28mergetools: simplify how we handle "vim" and "defaults"Libravatar David Aguilar6-52/+34
2013-01-27mergetool--lib: don't call "exit" in setup_toolLibravatar John Keeping1-3/+20
2013-01-27mergetool--lib: improve show_tool_help() outputLibravatar David Aguilar1-5/+21
2013-01-27mergetools/vim: remove redundant diff commandLibravatar David Aguilar1-10/+2
2013-01-25git-difftool: use git-mergetool--lib for "--tool-help"Libravatar John Keeping1-48/+7
2013-01-25git-mergetool: don't hardcode 'mergetool' in show_tool_helpLibravatar John Keeping1-2/+4
2013-01-25git-mergetool: remove redundant assignmentLibravatar John Keeping1-1/+0
2013-01-25git-mergetool: move show_tool_help to mergetool--libLibravatar John Keeping2-37/+37
2012-10-21Git 1.8.0Libravatar Junio C Hamano3-10/+19
2012-10-17Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiLibravatar Junio C Hamano15-37/+65
2012-10-17git-gui 0.17Libravatar Pat Thoyts1-1/+1
2012-10-17git-gui: Don't prepend the prefix if value looks like a full pathLibravatar Andrew Wong1-2/+7
2012-10-17git-gui: Detect full path when parsing argumentsLibravatar Andrew Wong1-1/+10
2012-10-17Git 1.8.0-rc3Libravatar Junio C Hamano2-5/+4
2012-10-17Merge git://github.com/git-l10n/git-poLibravatar Junio C Hamano2-914/+913
2012-10-17Sync with 1.7.12.4Libravatar Junio C Hamano2-1/+25
2012-10-17Git 1.7.12.4Libravatar Junio C Hamano4-3/+27
2012-10-17Merge branch 'jk/maint-http-half-auth-push' into maintLibravatar Junio C Hamano3-6/+6
2012-10-17Merge branch 'rr/git-uri-doc' into maintLibravatar Junio C Hamano1-2/+6
2012-10-17Merge branch 'bw/cp-a-is-gnuism' into maintLibravatar Junio C Hamano3-3/+3
2012-10-17Merge branch 'nd/doc-ignore' into maintLibravatar Junio C Hamano1-1/+5
2012-10-17Merge branch 'jc/doc-long-options' into maintLibravatar Junio C Hamano1-1/+11
2012-10-17Merge branch 'jc/maint-t1450-fsck-order-fix' into maintLibravatar Junio C Hamano1-3/+1
2012-10-17Merge branch 'rr/test-use-shell-path-not-shell' into maintLibravatar Junio C Hamano1-16/+16
2012-10-17Merge branch 'rr/test-make-sure-we-have-git' into maintLibravatar Junio C Hamano2-10/+9
2012-10-17Merge branch 'po/maint-docs' into maintLibravatar Junio C Hamano5-15/+28
2012-10-17Merge branch 'jc/ll-merge-binary-ours' into maintLibravatar Junio C Hamano5-12/+41
2012-10-17Merge branch 'db/doc-custom-xmlto' into maintLibravatar Junio C Hamano1-2/+3
2012-10-17Merge branch 'master' of https://github.com/nafmo/git-l10n-svLibravatar Jiang Xin1-441/+438
2012-10-17Merge branch 'master' of git://github.com/vnwildman/gitLibravatar Jiang Xin1-473/+475
2012-10-17l10n: vi.po: update from v1.8.0-rc2-4-g42e55Libravatar Tran Ngoc Quan1-473/+475
2012-10-16Documentation/RelNotes: remove "updated up to this revision" markersLibravatar Thomas Ackermann5-25/+0
2012-10-16Update draft release notes to 1.8.0Libravatar Junio C Hamano1-0/+7
2012-10-16Merge branch 'jk/maint-http-half-auth-push'Libravatar Junio C Hamano3-6/+6
2012-10-16l10n: Update Swedish translation (1964t0f0u)Libravatar Peter Krefting1-441/+438
2012-10-16l10n: Update git.pot (3 new, 6 removed messages)Libravatar Jiang Xin1-437/+415
2012-10-16Merge branch 'master' of git://github.com/vnwildman/gitLibravatar Jiang Xin1-672/+4096
2012-10-15l10n: vi.po: update translation upto cc76011Libravatar Tran Ngoc Quan1-672/+4096
2012-10-13Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2012-10-13Fix spelling error in post-receive-email hookLibravatar Richard Fearn1-1/+1
2012-10-12Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2012-10-12http: fix segfault in handle_curl_resultLibravatar Jeff King3-6/+6
2012-10-12gitweb.cgi: fix "comitter_tz" typo in feedLibravatar Dylan Alex Simon1-1/+1
2012-10-11Git 1.8.0-rc2Libravatar Junio C Hamano1-1/+1
2012-10-10Merge branch 'rr/git-uri-doc'Libravatar Junio C Hamano1-2/+6
2012-10-10Merge branch 'bw/cp-a-is-gnuism'Libravatar Junio C Hamano3-3/+3