summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | rev-parse: --abbrev-ref option to shorten ref nameBert Wesarg2009-04-132-2/+26
| * | | | | | | | | | | | | | for-each-ref: utilize core.warnAmbiguousRefs for :short-formatBert Wesarg2009-04-133-4/+22
| * | | | | | | | | | | | | | shorten_unambiguous_ref(): add strict modeBert Wesarg2009-04-134-7/+19
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2009-04-1715-486/+825
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-124-70/+76
| * | | | | | | | | | | | | | Fix misspelled mergetool.keepBackupFerry Huberts2009-04-111-1/+1
| * | | | | | | | | | | | | | difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-086-388/+458
| * | | | | | | | | | | | | | mergetool: use $( ... ) instead of `backticks`David Aguilar2009-04-071-8/+8
| * | | | | | | | | | | | | | bash completion: add git-difftoolDavid Aguilar2009-04-071-5/+22
| * | | | | | | | | | | | | | difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-075-6/+96
| * | | | | | | | | | | | | | difftool: add various git-difftool testsDavid Aguilar2009-04-071-0/+147
| * | | | | | | | | | | | | | difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-077-4/+27
| * | | | | | | | | | | | | | difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-076-11/+14
| * | | | | | | | | | | | | | difftool: add a -y shortcut for --no-promptDavid Aguilar2009-04-072-25/+17
| * | | | | | | | | | | | | | difftool: use perl built-ins when testing for msysDavid Aguilar2009-04-071-2/+5
| * | | | | | | | | | | | | | difftool: remove the backup file featureDavid Aguilar2009-04-071-33/+1
| * | | | | | | | | | | | | | difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiffDavid Aguilar2009-04-071-7/+3
| * | | | | | | | | | | | | | git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg2009-04-073-5/+16
| * | | | | | | | | | | | | | git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg2009-04-072-4/+16
| * | | | | | | | | | | | | | doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg2009-04-071-1/+2
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-04-173-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | doc/gitattributes: clarify location of config textJeff King2009-04-171-3/+6
| * | | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-172-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-172-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Fix buffer overflow in config parserThomas Jarosch2009-04-172-2/+9
| * | | | | | | | | | | | | | git-apply: fix option descriptionUlrich Windl2009-04-161-1/+1
* | | | | | | | | | | | | | | hook/update: example of how to prevent branch creationPierre Habouzit2009-04-171-1/+10
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | get_local_heads(): do not return random pointer if there is no headNguyễn Thái Ngọc Duy2009-04-171-1/+1
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | gitignore git-bisect--helperJunio C Hamano2009-04-121-0/+1
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | GIT 1.6.3-rc0v1.6.3-rc0Junio C Hamano2009-04-122-3/+14
* | | | | | | | | | | | Documentation/git.txt: GIT 1.6.2.2 has been out for a whileNanako Shiraishi2009-04-121-1/+2
* | | | | | | | | | | | Merge branch 'jk/no-perl'Junio C Hamano2009-04-1213-4/+77
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tests: skip perl tests if NO_PERL is definedJeff King2009-04-0812-2/+48
| * | | | | | | | | | | | Makefile: allow building without perlJeff King2009-04-082-2/+29
* | | | | | | | | | | | | Merge branch 'sb/doc-upstream-branch'Junio C Hamano2009-04-122-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation: Introduce "upstream branch"Santi Béjar2009-04-072-1/+7
* | | | | | | | | | | | | | Merge branch 'jk/show-upstream'Junio C Hamano2009-04-127-131/+187
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | branch: show upstream branch when double verboseJeff King2009-04-072-7/+20
| * | | | | | | | | | | | | | make get_short_ref a public functionJeff King2009-04-073-104/+101
| * | | | | | | | | | | | | | for-each-ref: add "upstream" format fieldJeff King2009-04-073-0/+41
| * | | | | | | | | | | | | | for-each-ref: refactor refname handlingJeff King2009-04-071-21/+26
| * | | | | | | | | | | | | | for-each-ref: refactor get_short_ref functionJeff King2009-04-071-7/+7
* | | | | | | | | | | | | | | Merge branch 'fg/remote-prune'Junio C Hamano2009-04-125-34/+156
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add tests for remote groupsJeff King2009-04-091-0/+81
| * | | | | | | | | | | | | | | git remote update: Fallback to remote if group does not existFinn Arne Gangstad2009-04-072-3/+9
| * | | | | | | | | | | | | | | remote: New function remote_is_configured()Finn Arne Gangstad2009-04-072-0/+12
| * | | | | | | | | | | | | | | git remote update: Report error for non-existing groupsFinn Arne Gangstad2009-04-071-3/+8
| * | | | | | | | | | | | | | | git remote update: New option --pruneFinn Arne Gangstad2009-04-052-5/+19
| * | | | | | | | | | | | | | | builtin-remote.c: Split out prune_remote as a separate function.Finn Arne Gangstad2009-04-051-26/+30
* | | | | | | | | | | | | | | | Merge branch 'cc/sha1-bsearch'Junio C Hamano2009-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status