summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-142-0/+26
|\
| * fix handling of multiple untracked files for git mv -kMichael J Gruber2009-01-142-1/+2
| * add test cases for "git mv -k"Michael J Gruber2009-01-141-0/+25
* | Make t3411 executableMiklos Vajna2009-01-141-0/+0
* | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-132-5/+6
|\ \ | |/
| * fast-import: Cleanup mode setting.Felipe Contreras2009-01-131-3/+4
| * Git.pm: call Error::Simple() properlyJay Soffian2009-01-131-2/+2
* | Merge branch 'kk/maint-http-push' into maintJunio C Hamano2009-01-131-6/+19
|\ \
| * | http-push: support full URI in handle_remote_ls_ctx()Kirill A. Korinskiy2008-12-241-6/+19
* | | Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano2009-01-132-0/+28
|\ \ \
| * | | merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-242-0/+28
| |/ /
* | | Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano2009-01-132-0/+119
|\ \ \
| * | | merge-recursive: do not clobber untracked working tree garbageJunio C Hamano2008-12-152-1/+33
| * | | modify/delete conflict resolution overwrites untracked fileClemens Buchacher2008-12-151-0/+87
* | | | Merge branch 'ap/maint-apply-modefix' into maintJunio C Hamano2009-01-132-1/+65
|\ \ \ \
| * | | | builtin-apply: prevent non-explicit permission changesJunio C Hamano2009-01-022-1/+65
* | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-132-1/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Avoid spurious error messages on error mistakes.Pierre Habouzit2009-01-131-1/+1
| * | | | contrib/examples/README: give an explanation of the status of these filesjidanni@jidanni.org2009-01-121-0/+3
* | | | | Merge branch 'mh/maint-sendmail-cc-doc' into maintJunio C Hamano2009-01-111-0/+1
|\ \ \ \ \
| * | | | | doc/git-send-email: mention sendemail.cc config variableMarkus Heidelberg2008-12-291-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintJunio C Hamano2009-01-112-1/+5
|\ \ \ \ \
| * | | | | git checkout: do not allow switching to a tree-ish that is not a commitJunio C Hamano2009-01-032-1/+5
* | | | | | Documentation/git-push.txt: minor: compress one optionjidanni@jidanni.org2009-01-111-3/+1
* | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-061-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano2009-01-061-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | README: tutorial.txt is now called gittutorial.txtJoey Hess2009-01-061-1/+1
| | | |/ / | | |/| |
* | | | | Be consistent in switch usage for tarHenrik Austad2009-01-051-1/+1
* | | | | Use capitalized names where appropriateHenrik Austad2009-01-052-4/+4
* | | | | fast-export: print usage when no options specifiedMiklos Vajna2009-01-031-0/+3
* | | | | Documentation/git-tag.txt: minor typo and grammar fixjidanni@jidanni.org2009-01-011-2/+2
* | | | | Prepare for v1.6.1.1 maintenance releaseJunio C Hamano2008-12-292-1/+24
* | | | | Documentation/diff-options.txt: unify optionsjidanni@jidanni.org2008-12-291-14/+4
* | | | | gitweb: Fix export check in git_get_projects_listDevin Doucette2008-12-271-2/+3
* | | | | Merge branch 'rs/maint-tformat-foldline' into maintJunio C Hamano2008-12-271-46/+73
|\ \ \ \ \
| * | | | | pretty: support multiline subjects with format:René Scharfe2008-12-271-19/+34
| * | | | | pretty: factor out format_subject()René Scharfe2008-12-271-18/+24
| * | | | | pretty: factor out skip_empty_lines()René Scharfe2008-12-271-9/+15
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/maint-retval-fix' into maintJunio C Hamano2008-12-272-37/+26
|\ \ \ \ \
| * | | | | merge-file: handle freopen() failureRené Scharfe2008-12-261-2/+5
| * | | | | daemon: cleanup: factor out xstrdup_tolower()René Scharfe2008-12-261-21/+13
| * | | | | daemon: cleanup: replace loop with ifRené Scharfe2008-12-261-13/+5
| * | | | | daemon: handle freopen() failureRené Scharfe2008-12-261-1/+3
| |/ / / /
* | | | | Merge branch 'sp/maint-describe-all-tag-warning' into maintJunio C Hamano2008-12-272-1/+7
|\ \ \ \ \
| * | | | | describe: Avoid unnecessary warning when using --allShawn O. Pearce2008-12-262-1/+7
* | | | | | git-send-email.txt: move --format-patch paragraph to a proper locationAdeodato Simó2008-12-271-6/+6
* | | | | | git-shortlog.txt: improve documentation about .mailmap filesAdeodato Simó2008-12-271-7/+33
| |/ / / / |/| | | |
* | | | | GIT 1.6.1v1.6.1Junio C Hamano2008-12-242-0/+9
* | | | | Merge branch 'js/rebase-i-p'Junio C Hamano2008-12-242-16/+58
|\ \ \ \ \
| * | | | | rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-242-3/+13
View Lorry Controller Status