Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mergetools: simplify how we handle "vim" and "defaults" | David Aguilar | 2013-01-28 | 6 | -52/+34 |
* | mergetool--lib: don't call "exit" in setup_tool | John Keeping | 2013-01-27 | 1 | -3/+20 |
* | mergetool--lib: improve show_tool_help() output | David Aguilar | 2013-01-27 | 1 | -5/+21 |
* | mergetools/vim: remove redundant diff command | David Aguilar | 2013-01-27 | 1 | -10/+2 |
* | git-difftool: use git-mergetool--lib for "--tool-help" | John Keeping | 2013-01-25 | 1 | -48/+7 |
* | git-mergetool: don't hardcode 'mergetool' in show_tool_help | John Keeping | 2013-01-25 | 1 | -2/+4 |
* | git-mergetool: remove redundant assignment | John Keeping | 2013-01-25 | 1 | -1/+0 |
* | git-mergetool: move show_tool_help to mergetool--lib | John Keeping | 2013-01-25 | 2 | -37/+37 |
* | Git 1.8.0v1.8.0 | Junio C Hamano | 2012-10-21 | 3 | -10/+19 |
* | Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui | Junio C Hamano | 2012-10-17 | 15 | -37/+65 |
|\ | |||||
| * | git-gui 0.17gitgui-0.17.0 | Pat Thoyts | 2012-10-17 | 1 | -1/+1 |
| * | git-gui: Don't prepend the prefix if value looks like a full path | Andrew Wong | 2012-10-17 | 1 | -2/+7 |
| * | git-gui: Detect full path when parsing arguments | Andrew Wong | 2012-10-17 | 1 | -1/+10 |
| * | git-gui: remove .git/CHERRY_PICK_HEAD after committing | Beat Bolli | 2012-09-17 | 1 | -0/+1 |
| * | git-gui: Fix a loose/lose mistake | Beat Bolli | 2012-09-17 | 1 | -1/+1 |
| * | git-gui: Fix semi-working shortcuts for unstage and revert | Vitaly _Vi Shukela | 2012-09-17 | 1 | -0/+4 |
| * | Merge branch 'rt/trans' | Pat Thoyts | 2012-06-19 | 1 | -18/+18 |
| |\ | |||||
| | * | git-gui: de.po: translate "remote" as "extern" | Ralf Thielow | 2012-06-19 | 1 | -14/+14 |
| | * | git-gui: de.po: translate "bare" as "bloß" | Ralf Thielow | 2012-06-19 | 1 | -1/+1 |
| | * | git-gui: de.po: consistently add untranslated hook names within braces | Ralf Thielow | 2012-06-19 | 1 | -3/+3 |
| * | | git-gui: preserve commit messages in utf-8 | Pat Thoyts | 2012-04-19 | 1 | -3/+8 |
| * | | git-gui: open console when using --trace on windows | Heiko Voigt | 2012-03-25 | 1 | -0/+1 |
| |/ | |||||
| * | git-gui: fix a typo in po/ files | Benjamin Kerensa | 2012-03-10 | 10 | -10/+10 |
| * | git-gui: Use PWD if it exists on Mac OS X | Marcus Karlsson | 2012-03-10 | 1 | -1/+3 |
| * | git-gui: fix git-gui crash due to uninitialized variable | Clemens Buchacher | 2012-01-22 | 1 | -0/+1 |
* | | Git 1.8.0-rc3v1.8.0-rc3 | Junio C Hamano | 2012-10-17 | 2 | -5/+4 |
* | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2012-10-17 | 2 | -914/+913 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/nafmo/git-l10n-sv | Jiang Xin | 2012-10-17 | 1 | -441/+438 |
| |\ \ | |||||
| | * | | l10n: Update Swedish translation (1964t0f0u) | Peter Krefting | 2012-10-16 | 1 | -441/+438 |
| * | | | Merge branch 'master' of git://github.com/vnwildman/git | Jiang Xin | 2012-10-17 | 1 | -473/+475 |
| |\ \ \ | |||||
| | * | | | l10n: vi.po: update from v1.8.0-rc2-4-g42e55 | Tran Ngoc Quan | 2012-10-17 | 1 | -473/+475 |
| | |/ / | |||||
* | | | | Sync with 1.7.12.4 | Junio C Hamano | 2012-10-17 | 2 | -1/+25 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Git 1.7.12.4v1.7.12.4maint-1.7.12 | Junio C Hamano | 2012-10-17 | 4 | -3/+27 |
| * | | | Merge branch 'jk/maint-http-half-auth-push' into maint | Junio C Hamano | 2012-10-17 | 3 | -6/+6 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rr/git-uri-doc' into maint | Junio C Hamano | 2012-10-17 | 1 | -2/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'bw/cp-a-is-gnuism' into maint | Junio C Hamano | 2012-10-17 | 3 | -3/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'nd/doc-ignore' into maint | Junio C Hamano | 2012-10-17 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/doc-long-options' into maint | Junio C Hamano | 2012-10-17 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/maint-t1450-fsck-order-fix' into maint | Junio C Hamano | 2012-10-17 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rr/test-use-shell-path-not-shell' into maint | Junio C Hamano | 2012-10-17 | 1 | -16/+16 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rr/test-make-sure-we-have-git' into maint | Junio C Hamano | 2012-10-17 | 2 | -10/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'po/maint-docs' into maint | Junio C Hamano | 2012-10-17 | 5 | -15/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/ll-merge-binary-ours' into maint | Junio C Hamano | 2012-10-17 | 5 | -12/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'db/doc-custom-xmlto' into maint | Junio C Hamano | 2012-10-17 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | Documentation/RelNotes: remove "updated up to this revision" markers | Thomas Ackermann | 2012-10-16 | 5 | -25/+0 |
* | | | | | | | | | | | | | | | Update draft release notes to 1.8.0 | Junio C Hamano | 2012-10-16 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push' | Junio C Hamano | 2012-10-16 | 3 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | http: fix segfault in handle_curl_result | Jeff King | 2012-10-12 | 3 | -6/+6 |
* | | | | | | | | | | | | | | l10n: Update git.pot (3 new, 6 removed messages) | Jiang Xin | 2012-10-16 | 1 | -437/+415 |
* | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/vnwildman/git | Jiang Xin | 2012-10-16 | 1 | -672/+4096 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |