summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-286-52/+34
* mergetool--lib: don't call "exit" in setup_toolJohn Keeping2013-01-271-3/+20
* mergetool--lib: improve show_tool_help() outputDavid Aguilar2013-01-271-5/+21
* mergetools/vim: remove redundant diff commandDavid Aguilar2013-01-271-10/+2
* git-difftool: use git-mergetool--lib for "--tool-help"John Keeping2013-01-251-48/+7
* git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping2013-01-251-2/+4
* git-mergetool: remove redundant assignmentJohn Keeping2013-01-251-1/+0
* git-mergetool: move show_tool_help to mergetool--libJohn Keeping2013-01-252-37/+37
* Git 1.8.0v1.8.0Junio C Hamano2012-10-213-10/+19
* Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiJunio C Hamano2012-10-1715-37/+65
|\
| * git-gui 0.17gitgui-0.17.0Pat Thoyts2012-10-171-1/+1
| * git-gui: Don't prepend the prefix if value looks like a full pathAndrew Wong2012-10-171-2/+7
| * git-gui: Detect full path when parsing argumentsAndrew Wong2012-10-171-1/+10
| * git-gui: remove .git/CHERRY_PICK_HEAD after committingBeat Bolli2012-09-171-0/+1
| * git-gui: Fix a loose/lose mistakeBeat Bolli2012-09-171-1/+1
| * git-gui: Fix semi-working shortcuts for unstage and revertVitaly _Vi Shukela2012-09-171-0/+4
| * Merge branch 'rt/trans'Pat Thoyts2012-06-191-18/+18
| |\
| | * git-gui: de.po: translate "remote" as "extern"Ralf Thielow2012-06-191-14/+14
| | * git-gui: de.po: translate "bare" as "bloß"Ralf Thielow2012-06-191-1/+1
| | * git-gui: de.po: consistently add untranslated hook names within bracesRalf Thielow2012-06-191-3/+3
| * | git-gui: preserve commit messages in utf-8Pat Thoyts2012-04-191-3/+8
| * | git-gui: open console when using --trace on windowsHeiko Voigt2012-03-251-0/+1
| |/
| * git-gui: fix a typo in po/ filesBenjamin Kerensa2012-03-1010-10/+10
| * git-gui: Use PWD if it exists on Mac OS XMarcus Karlsson2012-03-101-1/+3
| * git-gui: fix git-gui crash due to uninitialized variableClemens Buchacher2012-01-221-0/+1
* | Git 1.8.0-rc3v1.8.0-rc3Junio C Hamano2012-10-172-5/+4
* | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-10-172-914/+913
|\ \
| * \ Merge branch 'master' of https://github.com/nafmo/git-l10n-svJiang Xin2012-10-171-441/+438
| |\ \
| | * | l10n: Update Swedish translation (1964t0f0u)Peter Krefting2012-10-161-441/+438
| * | | Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin2012-10-171-473/+475
| |\ \ \
| | * | | l10n: vi.po: update from v1.8.0-rc2-4-g42e55Tran Ngoc Quan2012-10-171-473/+475
| | |/ /
* | | | Sync with 1.7.12.4Junio C Hamano2012-10-172-1/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Git 1.7.12.4v1.7.12.4maint-1.7.12Junio C Hamano2012-10-174-3/+27
| * | | Merge branch 'jk/maint-http-half-auth-push' into maintJunio C Hamano2012-10-173-6/+6
| |\ \ \
| * \ \ \ Merge branch 'rr/git-uri-doc' into maintJunio C Hamano2012-10-171-2/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'bw/cp-a-is-gnuism' into maintJunio C Hamano2012-10-173-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/doc-ignore' into maintJunio C Hamano2012-10-171-1/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/doc-long-options' into maintJunio C Hamano2012-10-171-1/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-t1450-fsck-order-fix' into maintJunio C Hamano2012-10-171-3/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rr/test-use-shell-path-not-shell' into maintJunio C Hamano2012-10-171-16/+16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rr/test-make-sure-we-have-git' into maintJunio C Hamano2012-10-172-10/+9
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'po/maint-docs' into maintJunio C Hamano2012-10-175-15/+28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano2012-10-175-12/+41
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'db/doc-custom-xmlto' into maintJunio C Hamano2012-10-171-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Documentation/RelNotes: remove "updated up to this revision" markersThomas Ackermann2012-10-165-25/+0
* | | | | | | | | | | | | | | Update draft release notes to 1.8.0Junio C Hamano2012-10-161-0/+7
* | | | | | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push'Junio C Hamano2012-10-163-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | http: fix segfault in handle_curl_resultJeff King2012-10-123-6/+6
* | | | | | | | | | | | | | l10n: Update git.pot (3 new, 6 removed messages)Jiang Xin2012-10-161-437/+415
* | | | | | | | | | | | | | Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin2012-10-161-672/+4096
|\ \ \ \ \ \ \ \ \ \ \ \ \ \