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