Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da/difftool' | Junio C Hamano | 2009-04-17 | 15 | -486/+825 |
|\ | |||||
| * | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | 2009-04-12 | 4 | -70/+76 |
| * | Fix misspelled mergetool.keepBackup | Ferry Huberts | 2009-04-11 | 1 | -1/+1 |
| * | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | 2009-04-08 | 6 | -388/+458 |
| * | mergetool: use $( ... ) instead of `backticks` | David Aguilar | 2009-04-07 | 1 | -8/+8 |
| * | bash completion: add git-difftool | David Aguilar | 2009-04-07 | 1 | -5/+22 |
| * | difftool: add support for a difftool.prompt config variable | David Aguilar | 2009-04-07 | 5 | -6/+96 |
| * | difftool: add various git-difftool tests | David Aguilar | 2009-04-07 | 1 | -0/+147 |
| * | difftool: move 'git-difftool' out of contrib | David Aguilar | 2009-04-07 | 7 | -4/+27 |
| * | difftool/mergetool: add diffuse as merge and diff tool | Sebastian Pipping | 2009-04-07 | 6 | -11/+14 |
| * | difftool: add a -y shortcut for --no-prompt | David Aguilar | 2009-04-07 | 2 | -25/+17 |
| * | difftool: use perl built-ins when testing for msys | David Aguilar | 2009-04-07 | 1 | -2/+5 |
| * | difftool: remove the backup file feature | David Aguilar | 2009-04-07 | 1 | -33/+1 |
| * | difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff | David Aguilar | 2009-04-07 | 1 | -7/+3 |
| * | git-mergetool: add new merge tool TortoiseMerge | Markus Heidelberg | 2009-04-07 | 3 | -5/+16 |
| * | git-mergetool/difftool: make (g)vimdiff workable under Windows | Markus Heidelberg | 2009-04-07 | 2 | -4/+16 |
| * | doc/merge-config: list ecmerge as a built-in merge tool | Markus Heidelberg | 2009-04-07 | 1 | -1/+2 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-04-17 | 3 | -5/+15 |
|\ \ | |||||
| * | | doc/gitattributes: clarify location of config text | Jeff King | 2009-04-17 | 1 | -3/+6 |
| * | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-17 | 2 | -2/+9 |
| |\ \ | |||||
| | * \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-17 | 2 | -2/+9 |
| | |\ \ | |||||
| | | * | | Fix buffer overflow in config parser | Thomas Jarosch | 2009-04-17 | 2 | -2/+9 |
| * | | | | git-apply: fix option description | Ulrich Windl | 2009-04-16 | 1 | -1/+1 |
* | | | | | hook/update: example of how to prevent branch creation | Pierre Habouzit | 2009-04-17 | 1 | -1/+10 |
* | | | | | get_local_heads(): do not return random pointer if there is no head | Nguyễn Thái Ngọc Duy | 2009-04-17 | 1 | -1/+1 |
* | | | | | gitignore git-bisect--helper | Junio C Hamano | 2009-04-12 | 1 | -0/+1 |
* | | | | | GIT 1.6.3-rc0v1.6.3-rc0 | Junio C Hamano | 2009-04-12 | 2 | -3/+14 |
* | | | | | Documentation/git.txt: GIT 1.6.2.2 has been out for a while | Nanako Shiraishi | 2009-04-12 | 1 | -1/+2 |
* | | | | | Merge branch 'jk/no-perl' | Junio C Hamano | 2009-04-12 | 13 | -4/+77 |
|\ \ \ \ \ | |||||
| * | | | | | tests: skip perl tests if NO_PERL is defined | Jeff King | 2009-04-08 | 12 | -2/+48 |
| * | | | | | Makefile: allow building without perl | Jeff King | 2009-04-08 | 2 | -2/+29 |
* | | | | | | Merge branch 'sb/doc-upstream-branch' | Junio C Hamano | 2009-04-12 | 2 | -1/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: Introduce "upstream branch" | Santi Béjar | 2009-04-07 | 2 | -1/+7 |
* | | | | | | | Merge branch 'jk/show-upstream' | Junio C Hamano | 2009-04-12 | 7 | -131/+187 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | branch: show upstream branch when double verbose | Jeff King | 2009-04-07 | 2 | -7/+20 |
| * | | | | | | | make get_short_ref a public function | Jeff King | 2009-04-07 | 3 | -104/+101 |
| * | | | | | | | for-each-ref: add "upstream" format field | Jeff King | 2009-04-07 | 3 | -0/+41 |
| * | | | | | | | for-each-ref: refactor refname handling | Jeff King | 2009-04-07 | 1 | -21/+26 |
| * | | | | | | | for-each-ref: refactor get_short_ref function | Jeff King | 2009-04-07 | 1 | -7/+7 |
* | | | | | | | | Merge branch 'fg/remote-prune' | Junio C Hamano | 2009-04-12 | 5 | -34/+156 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add tests for remote groups | Jeff King | 2009-04-09 | 1 | -0/+81 |
| * | | | | | | | | git remote update: Fallback to remote if group does not exist | Finn Arne Gangstad | 2009-04-07 | 2 | -3/+9 |
| * | | | | | | | | remote: New function remote_is_configured() | Finn Arne Gangstad | 2009-04-07 | 2 | -0/+12 |
| * | | | | | | | | git remote update: Report error for non-existing groups | Finn Arne Gangstad | 2009-04-07 | 1 | -3/+8 |
| * | | | | | | | | git remote update: New option --prune | Finn Arne Gangstad | 2009-04-05 | 2 | -5/+19 |
| * | | | | | | | | builtin-remote.c: Split out prune_remote as a separate function. | Finn Arne Gangstad | 2009-04-05 | 1 | -26/+30 |
* | | | | | | | | | Merge branch 'cc/sha1-bsearch' | Junio C Hamano | 2009-04-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | sha1-lookup: fix up the assertion message | Junio C Hamano | 2009-04-06 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'cc/bisect-filter' | Junio C Hamano | 2009-04-12 | 20 | -665/+985 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-list: add "int bisect_show_flags" in "struct rev_list_info" | Christian Couder | 2009-04-07 | 3 | -12/+9 |