Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/detached-stash' | Junio C Hamano | 2010-09-03 | 1 | -5/+11 |
|\ | |||||
| * | detached-stash: update Documentation | Jon Seymour | 2010-08-21 | 1 | -5/+11 |
* | | Merge branch 'jn/maint-doc-user-manual-html-doctype' | Junio C Hamano | 2010-09-03 | 2 | -2/+5 |
|\ \ | |||||
| * | | docs: fix Makefile dependency for user manual | Jeff King | 2010-08-21 | 1 | -1/+1 |
| * | | Documentation: set a !DOCTYPE for user manual | Jonathan Nieder | 2010-08-20 | 1 | -1/+4 |
* | | | Merge branch 'jc/maint-doc-em-dash' | Junio C Hamano | 2010-09-03 | 7 | -18/+19 |
|\ \ \ | |||||
| * | | | Work around em-dash handling in newer AsciiDoc | Junio C Hamano | 2010-08-24 | 7 | -18/+19 |
* | | | | Merge branch 'mg/doc-bundle' | Junio C Hamano | 2010-09-03 | 1 | -33/+34 |
|\ \ \ \ | |||||
| * | | | | git-bundle.txt: Clarify rev-list-args restrictions | Michael J Gruber | 2010-08-23 | 1 | -1/+2 |
| * | | | | git-bundle.txt: whitespace cleanup | Michael J Gruber | 2010-08-23 | 1 | -28/+28 |
| * | | | | git-bundle.txt: Cleanup | Michael J Gruber | 2010-08-23 | 1 | -9/+9 |
* | | | | | Merge branch 'jn/doc-backslash' | Junio C Hamano | 2010-09-03 | 26 | -59/+64 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: remove stray backslash in show-branch discussion | Jonathan Nieder | 2010-08-20 | 1 | -4/+4 |
| * | | | | | Documentation: remove stray backslashes from "Fighting regressions" article | Jonathan Nieder | 2010-08-20 | 1 | -1/+1 |
| * | | | | | Documentation: do not convert ... operator to ellipses | Jonathan Nieder | 2010-08-20 | 4 | -4/+4 |
| * | | | | | Documentation: avoid stray backslash in user manual | Jonathan Nieder | 2010-08-20 | 1 | -2/+2 |
| * | | | | | Documentation: avoid stray backslashes in core tutorial | Jonathan Nieder | 2010-08-20 | 1 | -9/+9 |
| * | | | | | Documentation: remove stray backslashes in rev-parse manual | Jonathan Nieder | 2010-08-20 | 1 | -4/+5 |
| * | | | | | Documentation: remove backslash before ~ in fast-import manual | Jonathan Nieder | 2010-08-20 | 1 | -1/+1 |
| * | | | | | Documentation: remove stray backslash from "git bundle" manual | Jonathan Nieder | 2010-08-20 | 1 | -4/+4 |
| * | | | | | Documentation/technical: avoid stray backslash in parse-options API docs | Jonathan Nieder | 2010-08-20 | 1 | -4/+4 |
| * | | | | | Documentation: remove backslashes in manpage synopses | Jonathan Nieder | 2010-08-20 | 7 | -10/+10 |
| * | | | | | Documentation: clarify quoting in gitignore docs | Jonathan Nieder | 2010-08-20 | 1 | -2/+2 |
| * | | | | | Documentation: clarify quoting in "git rm" example | Jonathan Nieder | 2010-08-20 | 1 | -3/+3 |
| * | | | | | Documentation: add missing quotes to "git grep" examples | Jonathan Nieder | 2010-08-20 | 1 | -2/+2 |
| * | | | | | Documentation: clarify quoting in "git add" example | Jonathan Nieder | 2010-08-20 | 1 | -2/+2 |
| * | | | | | Documentation: unbreak regex in show-ref manual | Jonathan Nieder | 2010-08-20 | 2 | -2/+3 |
| * | | | | | Documentation: quoting trouble in "git rm" discussion | Jonathan Nieder | 2010-08-20 | 2 | -1/+3 |
| * | | | | | Documentation: tweak description of log.date | Jonathan Nieder | 2010-08-20 | 1 | -4/+5 |
* | | | | | | Merge branch 'jn/update-contrib-example-merge' | Junio C Hamano | 2010-09-03 | 2 | -9/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fmt-merge-msg -m to override merge title | Jonathan Nieder | 2010-08-18 | 1 | -2/+7 |
| * | | | | | | merge-base --independent to print reduced parent list in a merge | Jonathan Nieder | 2010-08-18 | 1 | -0/+9 |
| * | | | | | | merge-base --octopus to mimic show-branch --merge-base | Jonathan Nieder | 2010-08-18 | 1 | -7/+12 |
| * | | | | | | Documentation: add a SEE ALSO section for merge-base | Jonathan Nieder | 2010-08-18 | 1 | -0/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 4 | -0/+129 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+12 |
| * | | | | | | ll-merge: make flag easier to populate | Jonathan Nieder | 2010-08-06 | 1 | -4/+7 |
| * | | | | | | Documentation/technical: document ll_merge | Jonathan Nieder | 2010-08-06 | 1 | -0/+70 |
| * | | | | | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 2 | -0/+44 |
* | | | | | | | Sync with 1.7.2.3 | Junio C Hamano | 2010-09-03 | 2 | -8/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Git 1.7.2.3v1.7.2.3 | Junio C Hamano | 2010-09-03 | 2 | -8/+2 |
* | | | | | | | | Prepare for 1.7.3 | Junio C Hamano | 2010-09-01 | 1 | -0/+73 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-09-01 | 1 | -0/+46 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Prepare for 1.7.2.3 | Junio C Hamano | 2010-09-01 | 1 | -0/+46 |
| * | | | | | | | Merge branch 'dj/fetch-tagopt' into maint | Junio C Hamano | 2010-09-01 | 2 | -3/+9 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | install-webdoc: filter timestamp-only changes correctly | Junio C Hamano | 2010-09-01 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jn/cherry-revert-message-clean-up' | Junio C Hamano | 2010-08-31 | 1 | -6/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Eliminate “Finished cherry-pick/revert” message | Jonathan Nieder | 2010-08-15 | 1 | -6/+0 |
* | | | | | | | | | Merge branch 'dj/fetch-tagopt' | Junio C Hamano | 2010-08-31 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | fetch: allow command line --tags to override config | Daniel Johnson | 2010-08-14 | 2 | -3/+9 |
| | |_|_|/ / / / | |/| | | | | | |