Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mv/apply-parse-opt' | Junio C Hamano | 2009-01-17 | 1 | -2/+2 |
|\ | |||||
| * | parse-opt: migrate builtin-apply. | Miklos Vajna | 2008-12-30 | 1 | -2/+2 |
* | | Merge branch 'tr/rebase-root' | Junio C Hamano | 2009-01-17 | 1 | -5/+16 |
|\ \ | |||||
| * | | rebase: update documentation for --root | Thomas Rast | 2009-01-11 | 1 | -5/+16 |
* | | | Merge branch 'maint' | Junio C Hamano | 2009-01-17 | 3 | -3/+11 |
|\ \ \ | |||||
| * | | | Update draft release notes for 1.6.1.1 | Junio C Hamano | 2009-01-17 | 1 | -1/+6 |
| * | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-17 | 2 | -2/+5 |
| |\ \ \ | |||||
| | * | | | Documentation: let asciidoc align related options | Markus Heidelberg | 2009-01-17 | 1 | -1/+4 |
| | * | | | githooks.txt: add missing word | Stephan Beyer | 2009-01-17 | 1 | -1/+1 |
* | | | | | Documentation: let asciidoc align related options | Markus Heidelberg | 2009-01-17 | 1 | -2/+4 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-14 | 1 | -2/+23 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Update draft release notes to 1.6.1.1 | Junio C Hamano | 2009-01-14 | 1 | -2/+23 |
* | | | | | Update 1.6.2 draft release notes | Junio C Hamano | 2009-01-13 | 1 | -1/+38 |
* | | | | | Merge branch 'jc/maint-ls-tree' | Junio C Hamano | 2009-01-13 | 1 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Document git-ls-tree --full-tree | Nanako Shiraishi | 2009-01-01 | 1 | -1/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'fe/cvsserver' | Junio C Hamano | 2009-01-13 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | cvsserver: add option to configure commit message | Fabian Emmes | 2009-01-03 | 1 | -0/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'np/no-loosen-prune-expire-now' | Junio C Hamano | 2009-01-13 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | objects to be pruned immediately don't have to be loosened | Nicolas Pitre | 2009-01-01 | 1 | -1/+3 |
* | | | | | | Merge branch 'mh/cherry-default' | Junio C Hamano | 2009-01-13 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: clarify which parameters are optional to git-cherry | Markus Heidelberg | 2009-01-05 | 1 | -1/+1 |
| * | | | | | | git-cherry: make <upstream> parameter optional | Markus Heidelberg | 2009-01-01 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Fix Documentation typos surrounding the word 'handful'. | Jon Loeliger | 2009-01-13 | 8 | -11/+11 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-11 | 1 | -3/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'mh/maint-sendmail-cc-doc' into maint | Junio C Hamano | 2009-01-11 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Documentation/git-push.txt: minor: compress one option | jidanni@jidanni.org | 2009-01-11 | 1 | -3/+1 |
* | | | | | | | filter-branch: add git_commit_non_empty_tree and --prune-empty. | Pierre Habouzit | 2009-01-10 | 1 | -0/+14 |
* | | | | | | | Merge branch 'mh/maint-sendmail-cc-doc' | Junio C Hamano | 2009-01-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | doc/git-send-email: mention sendemail.cc config variable | Markus Heidelberg | 2008-12-29 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/diff-ihc' | Junio C Hamano | 2009-01-07 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: add option to show context between close hunks | René Scharfe | 2008-12-29 | 1 | -0/+4 |
* | | | | | | | Merge branch 'mv/um-pdf' | Junio C Hamano | 2009-01-07 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add support for a pdf version of the user manual | Miklos Vajna | 2008-12-10 | 1 | -0/+13 |
* | | | | | | | | strbuf: instate cleanup rule in case of non-memory errors | René Scharfe | 2009-01-06 | 1 | -2/+9 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-05 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Be consistent in switch usage for tar | Henrik Austad | 2009-01-05 | 1 | -1/+1 |
| * | | | | | | | Use capitalized names where appropriate | Henrik Austad | 2009-01-05 | 2 | -4/+4 |
* | | | | | | | | Merge branch 'cb/mergetool' | Junio C Hamano | 2009-01-01 | 2 | -1/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mergetool: Don't keep temporary merge files unless told to | Charles Bailey | 2008-12-12 | 1 | -0/+7 |
| * | | | | | | | | Add -y/--no-prompt option to mergetool | Charles Bailey | 2008-11-14 | 2 | -1/+13 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Documentation/git-tag.txt: minor typo and grammar fix | jidanni@jidanni.org | 2009-01-01 | 1 | -2/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'lt/reset-merge' | Junio C Hamano | 2008-12-29 | 1 | -1/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Document "git-reset --merge" | Junio C Hamano | 2008-12-09 | 1 | -1/+28 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-29 | 2 | -14/+27 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Prepare for v1.6.1.1 maintenance release | Junio C Hamano | 2008-12-29 | 1 | -0/+23 |
| * | | | | | | | Documentation/diff-options.txt: unify options | jidanni@jidanni.org | 2008-12-29 | 1 | -14/+4 |
* | | | | | | | | Fix the building of gitman.info document | Teemu Likonen | 2008-12-29 | 2 | -3/+7 |
* | | | | | | | | Fix the building of user-manual.texi and gitman.texi documents | Teemu Likonen | 2008-12-29 | 1 | -3/+4 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-27 | 2 | -13/+39 |
|\ \ \ \ \ \ \ | |/ / / / / / |