summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-04-08Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-3/+0
2009-04-08Merge branch 'jc/maint-1.6.0-keep-pack' into maintLibravatar Junio C Hamano11-74/+105
2009-04-08Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Libravatar Junio C Hamano1-4/+4
2009-04-08Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Libravatar Junio C Hamano2-2/+2
2009-04-08Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Libravatar Junio C Hamano1-0/+4
2009-04-08Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Libravatar Junio C Hamano1-9/+12
2009-04-08process_{tree,blob}: Remove useless xstrdup callsLibravatar Björn Steinbrink2-3/+0
2009-04-08tests: skip perl tests if NO_PERL is definedLibravatar Jeff King12-2/+48
2009-04-08Makefile: allow building without perlLibravatar Jeff King2-2/+29
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Libravatar Matthieu Moy1-17/+25
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libLibravatar David Aguilar6-388/+458
2009-04-07branch: show upstream branch when double verboseLibravatar Jeff King2-7/+20
2009-04-07make get_short_ref a public functionLibravatar Jeff King3-104/+101
2009-04-07for-each-ref: add "upstream" format fieldLibravatar Jeff King3-0/+41
2009-04-07for-each-ref: refactor refname handlingLibravatar Jeff King1-21/+26
2009-04-07Merge branch 'maint'Libravatar Junio C Hamano5-12/+16
2009-04-07Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano3-9/+13
2009-04-07Change double quotes to single quotes in messageLibravatar Jari Aalto2-4/+4
2009-04-07Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano3-9/+13
2009-04-07Merge branch 'lt/reflog-expire'Libravatar Junio C Hamano1-6/+70
2009-04-07Merge branch 'bs/maint-1.6.0-tree-walk-prefix'Libravatar Junio C Hamano4-5/+29
2009-04-07Merge branch 'ms/http-auth'Libravatar Junio C Hamano3-0/+50
2009-04-07Merge branch 'js/maint-submodule-checkout'Libravatar Junio C Hamano2-3/+42
2009-04-07Merge branch 'cb/maint-merge-recursive-submodule-fix'Libravatar Junio C Hamano2-12/+78
2009-04-07Merge branch 'mh/html-path'Libravatar Junio C Hamano5-3/+22
2009-04-07mergetool: use $( ... ) instead of `backticks`Libravatar David Aguilar1-8/+8
2009-04-07bash completion: add git-difftoolLibravatar David Aguilar1-5/+22
2009-04-07difftool: add support for a difftool.prompt config variableLibravatar David Aguilar5-6/+96
2009-04-07difftool: add various git-difftool testsLibravatar David Aguilar1-0/+147
2009-04-07difftool: move 'git-difftool' out of contribLibravatar David Aguilar7-4/+27
2009-04-07difftool/mergetool: add diffuse as merge and diff toolLibravatar Sebastian Pipping6-11/+14
2009-04-07difftool: add a -y shortcut for --no-promptLibravatar David Aguilar2-25/+17
2009-04-07difftool: use perl built-ins when testing for msysLibravatar David Aguilar1-2/+5
2009-04-07difftool: remove the backup file featureLibravatar David Aguilar1-33/+1
2009-04-07difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiffLibravatar David Aguilar1-7/+3
2009-04-07git-mergetool: add new merge tool TortoiseMergeLibravatar Markus Heidelberg3-5/+16
2009-04-07git-mergetool/difftool: make (g)vimdiff workable under WindowsLibravatar Markus Heidelberg2-4/+16
2009-04-07doc/merge-config: list ecmerge as a built-in merge toolLibravatar Markus Heidelberg1-1/+2
2009-04-07rev-list: add "int bisect_show_flags" in "struct rev_list_info"Libravatar Christian Couder3-12/+9
2009-04-07rev-list: remove last static vars used in "show_commit"Libravatar Christian Couder3-28/+34
2009-04-07list-objects: add "void *data" parameter to show functionsLibravatar Christian Couder5-46/+49
2009-04-07git-rev-list.txt: make ascii markup uniform with other pages.Libravatar Matthieu Moy1-11/+11
2009-04-07git-send-email.txt: clarify which options take an argument.Libravatar Matthieu Moy1-17/+17
2009-04-07for-each-ref: refactor get_short_ref functionLibravatar Jeff King1-7/+7
2009-04-07Documentation: Introduce "upstream branch"Libravatar Santi Béjar2-1/+7
2009-04-07Documentation: clarify .gitattributes searchLibravatar Jason Merrill2-5/+5
2009-04-07git-checkout.txt: clarify that <branch> applies when no path is given.Libravatar Matthieu Moy1-2/+6
2009-04-07git-checkout.txt: fix incorrect statement about HEAD and indexLibravatar Matthieu Moy1-2/+2
2009-04-07git remote update: Fallback to remote if group does not existLibravatar Finn Arne Gangstad2-3/+9
2009-04-07remote: New function remote_is_configured()Libravatar Finn Arne Gangstad2-0/+12