Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ | |/ / / | |||||
| * | | | git-send-email.txt: move --format-patch paragraph to a proper location | Adeodato Simó | 2008-12-27 | 1 | -6/+6 |
| * | | | git-shortlog.txt: improve documentation about .mailmap files | Adeodato Simó | 2008-12-27 | 1 | -7/+33 |
* | | | | Start 1.6.2 cycle | Junio C Hamano | 2008-12-27 | 1 | -0/+28 |
|/ / / | |||||
* | | | GIT 1.6.1v1.6.1 | Junio C Hamano | 2008-12-24 | 2 | -0/+9 |
* | | | GIT 1.6.1-rc4v1.6.1-rc4 | Junio C Hamano | 2008-12-21 | 1 | -1/+18 |
* | | | Make help entries alphabetical | Richard Hartmann | 2008-12-21 | 1 | -4/+4 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-12-21 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | doc/git-fsck: change the way for getting heads' SHA1s | Markus Heidelberg | 2008-12-21 | 1 | -1/+2 |
* | | | | git-revert documentation: refer to new HOWTO on reverting faulty merges | Boyd Stephen Smith Jr | 2008-12-21 | 1 | -0/+8 |
* | | | | Documentation/git-show-branch: work around "single quote" typesetting glitch | Markus Heidelberg | 2008-12-21 | 1 | -1/+1 |
* | | | | Add a documentat on how to revert a faulty merge | Nanako Shiraishi | 2008-12-21 | 1 | -0/+179 |
* | | | | Documentation: fix typos, grammar, asciidoc syntax | Markus Heidelberg | 2008-12-19 | 1 | -1/+1 |
* | | | | Merge branch 'maint' to sync with GIT 1.6.0.6 | Junio C Hamano | 2008-12-19 | 20 | -29/+107 |
|\ \ \ \ | |/ / / | |||||
| * | | | GIT 1.6.0.6v1.6.0.6 | Junio C Hamano | 2008-12-19 | 4 | -0/+63 |
| |\ \ \ | |||||
| | * \ \ | GIT 1.5.6.6v1.5.6.6 | Junio C Hamano | 2008-12-16 | 3 | -0/+30 |
| | |\ \ \ | |||||
| | | * \ \ | GIT 1.5.5.6v1.5.5.6 | Junio C Hamano | 2008-12-16 | 2 | -0/+20 |
| | | |\ \ \ | |||||
| | | | * | | | GIT 1.5.4.7v1.5.4.7 | Junio C Hamano | 2008-12-16 | 1 | -0/+10 |
| * | | | | | | fast-export: deal with tag objects that do not have a tagger | Johannes Schindelin | 2008-12-19 | 1 | -0/+6 |
| * | | | | | | SubmittingPatches: mention the usage of real name in Signed-off-by: lines | Miklos Vajna | 2008-12-19 | 1 | -0/+3 |
| * | | | | | | Documentation: fix typos, grammar, asciidoc syntax | Markus Heidelberg | 2008-12-19 | 13 | -25/+25 |
* | | | | | | | Documentation: sync example output with git output | Markus Heidelberg | 2008-12-19 | 4 | -11/+9 |
* | | | | | | | Clarify documentation of "git checkout <tree-ish> paths" syntax | Nanako Shiraishi | 2008-12-17 | 1 | -1/+1 |
* | | | | | | | githooks documentation: add a note about the +x mode | Miklos Vajna | 2008-12-17 | 1 | -0/+4 |
* | | | | | | | doc/git-reset: add reference to git-stash | Markus Heidelberg | 2008-12-17 | 1 | -0/+2 |
* | | | | | | | Documentation: fix description for enabling hooks | Markus Heidelberg | 2008-12-17 | 2 | -2/+4 |
* | | | | | | | git-daemon documentation: use {tilde} | Miklos Vajna | 2008-12-17 | 1 | -2/+2 |
* | | | | | | | Documentation: Describe git-gui Tools menu configuration options. | Alexander Gavrilov | 2008-12-14 | 1 | -0/+51 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | git-config.txt: fix a typo | Jim Meyering | 2008-12-12 | 1 | -1/+1 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-09 | 1 | -9/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | work around Python warnings from AsciiDoc | Junio C Hamano | 2008-12-09 | 1 | -9/+9 |
* | | | | | | | Fix typos in documentation | Alexander Potashev | 2008-12-09 | 2 | -2/+2 |
* | | | | | | | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 | 9 | -49/+48 |
* | | | | | | | Define linkgit macro in [macros] section | Alexey Borzenkov | 2008-12-08 | 1 | -0/+3 |
* | | | | | | | Point "stale" 1.6.0.5 documentation from the main git documentation pagev1.6.1-rc2 | Junio C Hamano | 2008-12-07 | 1 | -1/+2 |
* | | | | | | | Update draft release notes for 1.6.1 | Junio C Hamano | 2008-12-07 | 1 | -22/+1 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-07 | 1 | -15/+28 |
|\ \ \ \ \ \ \ | |/ / / / / / |