aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAge
* Merge branch 'maint'Shawn O. Pearce2008-09-30
|\
| * Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)Michael Prokop2008-09-30
* | Correct typos in RelNotes-1.6.1Ralf Wildenhues2008-09-30
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29
|\ \
| * \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-29
| |\ \ | | |/
| | * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-29
| | |\
| * | \ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-18
| |\ \ \ | | | |/ | | |/|
| | * | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-18
* | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \ \ \
| * | | | Fix AsciiDoc errors in merge documentationJohan Herland2008-09-04
| * | | | git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-31
| * | | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-31
| * | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-30
| * | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-30
| |\ \ \ \
| | * | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-30
| | * | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-30
| * | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
| |/ / / /
* | | | | Merge branch 'maint'Shawn O. Pearce2008-09-26
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Documentation: clarify the details of overriding LESS via core.pagerChris Frey2008-09-26
* | | | | Merge branch 'jc/apply-include-exclude'Shawn O. Pearce2008-09-25
|\ \ \ \ \
| * | | | | git-apply:--include=pathspecJunio C Hamano2008-09-06
* | | | | | Merge branch 'ho/dirstat-by-file'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \
| * | | | | | diff --dirstat-by-file: count changed files, not linesHeikki Orsila2008-09-05
| |/ / / / /
* | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update release notes for 1.6.0.3Shawn O. Pearce2008-09-25
* | | | | | git-web--browse: Support for using /bin/start on MinGWPetr Baudis2008-09-24
* | | | | | Fixed some grammatical errors in git-rebase.txt documentation.Garry Dolley2008-09-24
* | | | | | Update draft release notes to 1.6.1Junio C Hamano2008-09-20
* | | | | | Merge branch 'maint'Junio C Hamano2008-09-19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Start draft release notes for 1.6.0.3Junio C Hamano2008-09-19
| * | | | | git-repack uses --no-repack-object, not --no-repack-delta.Mikael Magnusson2008-09-19
| * | | | | Bust the ghost of long-defunct diffcore-pathspec.Yann Dirson2008-09-19
* | | | | | Merge branch 'maint'Junio C Hamano2008-09-18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano2008-09-18
| |\ \ \ \ \
| * | | | | | Clarified gitattributes documentation regarding custom hunk header.Garry Dolley2008-09-18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-18
|\ \ \ \ \ \
| * | | | | | diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-30
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bw/shortref'Junio C Hamano2008-09-18
|\ \ \ \ \ \
| * | | | | | for-each-ref: `:short` format for `refname`Bert Wesarg2008-09-05
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs/decorate'Junio C Hamano2008-09-18
|\ \ \ \ \ \
| * | | | | | add '%d' pretty format specifier to show decorationRené Scharfe2008-09-04
| |/ / / / /
* | | | | | Merge branch 'jc/maint-checkout-keep-remove'Junio C Hamano2008-09-16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | checkout: do not lose staged removalJunio C Hamano2008-09-09
* | | | | | Sync with 1.6.0.2Junio C Hamano2008-09-12
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | GIT 1.6.0.2v1.6.0.2Junio C Hamano2008-09-12
| * | | | | Fix some manual typos.Ralf Wildenhues2008-09-12
* | | | | | allow installation of man and html doc from the man and html branchesMichael J Gruber2008-09-10
* | | | | | Merge branch 'maint'Junio C Hamano2008-09-10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update draft release notes for 1.6.0.2Junio C Hamano2008-09-10
| |/ / / /
* | | | | Merge branch 'ar/autospell'Junio C Hamano2008-09-07
|\ \ \ \ \ | |_|_|_|/ |/| | | |