summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-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-06Merge branch 'jc/name-branch'Libravatar Junio C Hamano11-50/+94
2009-04-06Merge branch 'jc/shared-literally'Libravatar Junio C Hamano10-38/+97
2009-04-06Merge branch 'mg/tracked-local-branches'Libravatar Junio C Hamano2-3/+14
2009-04-06Merge branch 'sb/format-patch-patchname'Libravatar Junio C Hamano17-129/+381
2009-04-06user-manual: the name of the hash function is SHA-1, not sha1Libravatar Felipe Contreras1-25/+25
2009-04-06docbook: change css styleLibravatar Felipe Contreras1-2/+12
2009-04-06user-manual: remove some git-foo usageLibravatar Felipe Contreras1-74/+74
2009-04-06Documentation: branch.*.merge can also affect 'git-push'Libravatar Santi Béjar1-1/+1
2009-04-06Add configuration variable for sign-off to format-patchLibravatar Heiko Voigt3-7/+24
2009-04-05bash completion: Update 'git am' optionsLibravatar Todd Zullinger1-1/+2
2009-04-05Merge branch 'maint'Libravatar Junio C Hamano4-5/+6
2009-04-05git submodule: fix usage lineLibravatar Julien Danjou1-1/+1
2009-04-05Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano2-2/+3
2009-04-05Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-2/+3
2009-04-05doc/git-pack-refs: fix two grammar issuesLibravatar Markus Heidelberg1-2/+2
2009-04-05tests: remove exit after test_done callLibravatar Jeff King17-26/+0
2009-04-05commit: abort commit if interactive add failedLibravatar Jeff King1-1/+2
2009-04-05bisect: improve error message when branch checkout failsLibravatar Christian Couder1-3/+3
2009-04-05git-repack: use non-dashed update-server-infoLibravatar Dan McGee1-1/+1
2009-04-04send-email: fix nasty bug in ask() functionLibravatar Jay Soffian2-2/+15
2009-04-02Update draft release notes to 1.6.3Libravatar Junio C Hamano1-2/+19
2009-04-02Sync with 1.6.2.2Libravatar Junio C Hamano2-12/+9
2009-04-02GIT 1.6.2.2Libravatar Junio C Hamano2-7/+10
2009-04-02Merge branch 'jc/maint-1.6.0-blame-s' into maintLibravatar Junio C Hamano1-4/+4
2009-04-02Merge branch 'js/maint-diff-temp-smudge' into maintLibravatar Junio C Hamano2-3/+26
2009-04-02Merge branch 'js/maint-1.6.0-exec-path-env' into maintLibravatar Junio C Hamano1-0/+4
2009-04-02Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintLibravatar Junio C Hamano2-2/+2
2009-04-02Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintLibravatar Junio C Hamano1-9/+12
2009-04-02Merge branch 'dm/maint-docco' into maintLibravatar Junio C Hamano10-230/+234
2009-04-02send-email: ensure quoted addresses are rfc2047 encodedLibravatar Jay Soffian2-1/+15
2009-04-02send-email: correct two tests which were going interactiveLibravatar Jay Soffian1-3/+5
2009-04-01Merge branch 'ef/fast-export'Libravatar Junio C Hamano2-2/+26
2009-04-01Merge branch 'mh/format-patch-add-header'Libravatar Junio C Hamano3-0/+22
2009-04-01Merge branch 'tr/maint-1.6.1-doc-format-patch--root'Libravatar Junio C Hamano1-9/+12
2009-04-01Merge branch 'maint'Libravatar Junio C Hamano3-2/+11
2009-04-01Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-1/+1
2009-04-01Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+1
2009-04-01Merge branch 'cj/doc-format'Libravatar Junio C Hamano9-88/+208
2009-04-01Merge branch 'jc/maint-1.6.0-keep-pack'Libravatar Junio C Hamano7-39/+91
2009-04-01Merge branch 'kb/tracking-count-no-merges'Libravatar Junio C Hamano1-1/+2
2009-04-01Documentation: git-svn: fix trunk/fetch svn-remote key typoLibravatar Wesley J. Landaker1-1/+1
2009-04-01Mailmap: Allow empty email addresses to be mappedLibravatar Björn Steinbrink1-4/+5
2009-04-01Make local branches behave like remote branches when --trackedLibravatar Michael J Gruber2-3/+6
2009-04-01Cleanup warning about known issues in cvsimport documentationLibravatar Heiko Voigt1-9/+11