summaryrefslogtreecommitdiffstats
path: root/ll-merge.h (unfollow)
Commit message (Expand)AuthorFilesLines
2008-07-02Documentation: be consistent about "git-" versus "git "Jonathan Nieder131-462/+462
2008-07-02Documentation: prepare to be consistent about "git-" versus "git "Jonathan Nieder4-10/+10
2008-07-02git-daemon(1): don't assume git-daemon is in /usr/binJonathan Nieder1-5/+5
2008-07-02Documentation: complicate example of "man git-command"Jonathan Nieder2-3/+3
2008-07-02whitespace fix in Documentation/git-repack.txtJonathan Nieder1-3/+3
2008-07-02Documentation: fix links to tutorials and other new manual pagesJonathan Nieder11-42/+38
2008-07-02Start draft release notes for 1.5.6.2Junio C Hamano2-1/+32
2008-07-02Fix 'git show' on signed tag of signed tag of commitThomas Rast1-1/+1
2008-06-30Add test results directory to t/.gitignoreBrian Gernhardt1-0/+1
2008-06-30fetch: give a hint to the user when local refs fail to updateJeff King1-4/+11
2008-06-30doc/rev-parse: clarify reflog vs --until for specifying revisionsJeff King1-1/+4
2008-06-30Update draft release notes for 1.6.0Junio C Hamano1-16/+24
2008-06-30Documentation: don't assume git-sh-setup and git-parse-remote are in PATHjrnieder@uchicago.edu2-2/+2
2008-06-30t9700: skip when Test::More is not availableJunio C Hamano1-0/+5
2008-06-30clone: respect the settings in $HOME/.gitconfig and /etc/gitconfigJohannes Schindelin1-0/+7
2008-06-30Fix t4017-diff-retval for white-space from wcBrian Gernhardt1-1/+1
2008-06-29git-svn: don't sanitize remote names in configEric Wong1-12/+3
2008-06-29show_stats(): fix stats width calculationOlivier Marin1-6/+6
2008-06-29Documentation: remove {show,whatchanged}.difftree config optionsOlivier Marin2-10/+0
2008-06-29git-svn: avoid filling up the disk with temp files.Avery Pennarun1-1/+4
2008-06-29git cat-file: Fix memory leak in batch modeBjörn Steinbrink1-0/+1
2008-06-29git-send-email: prevent undefined variable warnings if no encryption is setThomas Rast1-0/+3
2008-06-28fix git config example syntaxJoey Hess1-1/+1
2008-06-28avoid off-by-one error in run_upload_archiveJochen Voss1-1/+1
2008-06-28GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copyLea Wiemann1-1/+1
2008-06-28Allow git-apply to recount the lines in a hunk (AKA recountdiff)Johannes Schindelin3-43/+101
2008-06-28commit-tree: lift completely arbitrary limit of 16 parentsJohannes Schindelin1-23/+20
2008-06-28shrink git-shell by avoiding redundant dependenciesDmitry Potapov6-68/+79
2008-06-28help: check early if we have a command, if not try a documentation topicChristian Couder1-8/+14
2008-06-28git-apply: handle a patch that touches the same path more than once betterDon Zickus2-10/+157
2008-06-28fetch: report local storage errors in status tableJeff King1-12/+24
2008-06-28clone: respect url.insteadOf setting in global configsJohannes Schindelin1-1/+2
2008-06-28Document the double-dash "rev -- path" disambiguatorJunio C Hamano1-4/+33
2008-06-27Update sample pre-commit hook to use "diff --check"Junio C Hamano1-58/+6
2008-06-27diff --check: detect leftover conflict markersJunio C Hamano2-0/+49
2008-06-27Teach "diff --check" about new blank lines at endJunio C Hamano4-2/+37
2008-06-27checkdiff: pass diff_options to the callbackJunio C Hamano1-10/+11
2008-06-27Don't use dash commands (git-foo) in tutorial-2Ted Percival1-5/+5
2008-06-27test-lib.sh: show git init output when in verbose modeLea Wiemann1-1/+1
2008-06-27check_and_emit_line(): rename and refactorJunio C Hamano4-16/+25
2008-06-27diff --check: explain why we do not care whether old side is binaryJunio C Hamano1-2/+9
2008-06-27GIT 1.5.5.5v1.5.5.5Junio C Hamano3-2/+13
2008-06-27GIT 1.5.4.6v1.5.4.6Junio C Hamano3-2/+45
2008-06-27git-shell: accept "git foo" formJunio C Hamano1-4/+13
2008-06-26diff --check: do not discard error status upon seeing a good lineJunio C Hamano2-3/+13
2008-06-26improve for-each-ref test scriptJeff King1-17/+70
2008-06-26Add 'git-p4.allowSubmit' to git-p4Jing Xue1-0/+4
2008-06-26Start draft release notes for 1.6.0Junio C Hamano2-1/+106
2008-06-26update-hook-example: optionally allow non-fast-forwardDmitry Potapov1-33/+53
2008-06-26git-send-email: add support for TLS via Net::SMTP::SSLThomas Rast2-9/+40