aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* strbuf: instate cleanup rule in case of non-memory errorsRené Scharfe2009-01-06
* Merge branch 'maint'Junio C Hamano2009-01-06
|\
| * 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
* | | | Merge branch 'maint'Junio C Hamano2009-01-05
|\ \ \ \ | |/ / /
| * | | 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
* | | | remove trailing LF in die() messagesAlexander Potashev2009-01-05
* | | | bash: add '--merge' to 'git reset'SZEDER Gábor2009-01-05
* | | | show <tag>: reuse pp_user_info() instead of duplicating codeJohannes Schindelin2009-01-05
* | | | gitweb: use href() when generating URLs in OPMLGiuseppe Bilotta2009-01-05
* | | | Merge branch 'jc/maint-do-not-switch-to-non-commit'Junio C Hamano2009-01-03
|\ \ \ \
| * | | | git checkout: do not allow switching to a tree-ish that is not a commitJunio C Hamano2009-01-03
| | |/ / | |/| |
* | | | Merge branch 'ap/maint-apply-modefix'Junio C Hamano2009-01-03
|\ \ \ \
| * | | | builtin-apply: prevent non-explicit permission changesJunio C Hamano2009-01-02
| | |_|/ | |/| |
* | | | git wrapper: Make while loop more reader-friendlyJohannes Schindelin2009-01-02
* | | | Merge branch 'cb/mergetool'Junio C Hamano2009-01-01
|\ \ \ \
| * | | | mergetool: Don't keep temporary merge files unless told toCharles Bailey2008-12-12
| * | | | mergetool: Add prompt to continue after failing to merge a fileCharles Bailey2008-12-12
| * | | | Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-14
| * | | | Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey2008-11-14
* | | | | Merge branch 'maint'Junio C Hamano2009-01-01
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Documentation/git-tag.txt: minor typo and grammar fixjidanni@jidanni.org2009-01-01
* | | | | Merge branch 'lt/reset-merge'Junio C Hamano2008-12-29
|\ \ \ \ \
| * | | | | Document "git-reset --merge"Junio C Hamano2008-12-09
| * | | | | Add 'merge' mode to 'git reset'Linus Torvalds2008-12-02
* | | | | | Merge branch 'np/auto-thread'Junio C Hamano2008-12-29
|\ \ \ \ \ \
| * | | | | | Force t5302 to use a single threadJohannes Schindelin2008-12-15
| * | | | | | pack-objects: don't use too many threads with few objectsNicolas Pitre2008-12-13
| * | | | | | autodetect number of CPUs by default when using threadsNicolas Pitre2008-12-12
* | | | | | | Merge branch 'maint'Junio C Hamano2008-12-29
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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
* | | | | | | Fix the building of gitman.info documentTeemu Likonen2008-12-29
* | | | | | | Fix the building of user-manual.texi and gitman.texi documentsTeemu Likonen2008-12-29
* | | | | | | Merge branch 'maint'Junio C Hamano2008-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