summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-03-05Teach git mergetool to use custom commands defined at config timeLibravatar Charles Bailey2-4/+49
2008-03-05Changed an internal variable of mergetool to support custom commandsLibravatar Charles Bailey1-50/+50
2008-03-05Tidy up git mergetool's backup file behaviourLibravatar Charles Bailey2-24/+19
2008-03-05fsck.c: fix bogus "empty tree" checkLibravatar Junio C Hamano1-2/+0
2008-03-04Revert "unpack-objects: prevent writing of inconsistent objects"Libravatar Junio C Hamano2-106/+7
2008-03-04Revert "receive-pack: use strict mode for unpacking objects"Libravatar Junio C Hamano2-29/+13
2008-03-04Merge branch 'maint'Libravatar Junio C Hamano5-22/+23
2008-03-03Fix 'git remote show' regression on empty repository in 1.5.4Libravatar Shawn O. Pearce1-4/+0
2008-03-03t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --mergeLibravatar Mike Hommey1-28/+40
2008-03-03git-p4: Fix import of changesets with file deletionsLibravatar Simon Hausmann1-20/+25
2008-03-03Fix test for cleanup failure in t7300 on WindowsLibravatar Alex Riesen1-1/+2
2008-03-03t6120 (describe): check --long properlyLibravatar Junio C Hamano1-0/+1
2008-03-03Add git-describe test for "verify annotated tag names on output"Libravatar Shawn O. Pearce1-1/+16
2008-03-03Test for packed tags in git-describe outputLibravatar Shawn O. Pearce1-0/+3
2008-03-03Don't allow git-describe failures to go unnoticed in t6120Libravatar Shawn O. Pearce1-1/+3
2008-03-03describe: re-fix display_name()Libravatar Junio C Hamano1-1/+1
2008-03-03Fix incorrect wording in git-merge.txt.Libravatar Matthieu Moy1-1/+2
2008-03-03git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsLibravatar Gerrit Pape2-6/+17
2008-03-03Fix random crashes in http_cleanup()Libravatar Mike Hommey1-11/+3
2008-03-03describe: fix --long outputLibravatar Junio C Hamano1-5/+11
2008-03-03git-describe: use tags found in packed-refs correctlyLibravatar Junio C Hamano1-1/+1
2008-03-03fetch-pack: check parse_commit/object resultsLibravatar Martin Koegler1-7/+10
2008-03-03Update draft release notes for 1.5.5Libravatar Junio C Hamano1-1/+27
2008-03-02Merge branch 'maint'Libravatar Junio C Hamano5-6/+49
2008-03-02Update draft release notes for 1.5.4.4Libravatar Junio C Hamano1-1/+21
2008-03-02revert: actually check for a dirty indexLibravatar Jeff King2-4/+25
2008-03-02tests: introduce test_must_failLibravatar Junio C Hamano2-8/+25
2008-03-02git-submodule: Fix typo 'url' which should be '$url'Libravatar Ping Yin1-1/+1
2008-03-02receive-pack: Initialize PATH to include exec-dir.Libravatar Björn Steinbrink1-0/+2
2008-03-02Fix doc typos.Libravatar Ralf Wildenhues2-4/+4
2008-03-02fast-import: exit with proper message if not a git dirLibravatar Jean-Luc Herren1-0/+1
2008-03-02Merge branch 'np/verify-pack'Libravatar Junio C Hamano9-163/+185
2008-03-02format-patch: wrap cover-letter's shortlog sensiblyLibravatar Johannes Schindelin3-2/+25
2008-03-02format-patch: use the diff options for the cover letter, tooLibravatar Johannes Schindelin2-6/+16
2008-03-02gitweb: Mark first match when searching commit messagesLibravatar Jakub Narebski1-1/+1
2008-03-02Merge branch 'sp/describe-tag'Libravatar Junio C Hamano1-12/+33
2008-03-02Merge branch 'pb/cvsimport'Libravatar Junio C Hamano2-7/+16
2008-03-02Merge branch 'jc/maint-log-merge-left-right'Libravatar Junio C Hamano1-8/+4
2008-03-02Merge branch 'mh/maint-http-proxy-fix'Libravatar Junio C Hamano7-12/+22
2008-03-02Merge branch 'cb/http-test'Libravatar Junio C Hamano6-7/+230
2008-03-02Merge branch 'jc/remote-multi-url'Libravatar Junio C Hamano1-3/+3
2008-03-02Merge branch 'jn/gitweb-grep'Libravatar Junio C Hamano1-20/+38
2008-03-02Merge branch 'mk/maint-parse-careful'Libravatar Junio C Hamano22-427/+725
2008-03-02Merge branch 'sb/describe-long'Libravatar Junio C Hamano3-1/+21
2008-03-02Merge branch 'ew/maint-svn-cert-fileprovider'Libravatar Junio C Hamano0-0/+0
2008-03-02Merge branch 'js/maint-daemon'Libravatar Junio C Hamano1-5/+13
2008-03-02Documentation: Remove --{min,max}-age option from git-log(1)Libravatar Jakub Narebski1-0/+2
2008-03-02cleanup: remove unused git_checkout_configLibravatar Denis Cheng1-6/+1
2008-03-02Fix make_absolute_path() for parameters without a slashLibravatar Johannes Schindelin2-1/+5
2008-03-02diff: make sure work tree side is shown as 0{40} when differentLibravatar Junio C Hamano2-5/+55