summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* cygwin: Use native Win32 API for statDmitry Potapov2008-09-301-0/+9
* Merge branch 'maint'Shawn O. Pearce2008-09-301-4/+4
|\
| * Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)Michael Prokop2008-09-301-4/+4
* | Correct typos in RelNotes-1.6.1Ralf Wildenhues2008-09-302-3/+3
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-2/+2
|\ \
| * \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-296-46/+98
| |\ \ | | |/
| | * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-291-2/+2
| | |\
| * | \ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-185-9/+30
| |\ \ \ | | | |/ | | |/|
| | * | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-181-2/+2
* | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-293-7/+107
|\ \ \ \
| * | | | Fix AsciiDoc errors in merge documentationJohan Herland2008-09-041-4/+4
| * | | | git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-311-0/+65
| * | | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-311-1/+9
| * | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-301-3/+8
| * | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-301-6/+20
| |\ \ \ \
| | * | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-301-2/+9
| | * | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-301-6/+13
| * | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-301-0/+8
| |/ / / /
* | | | | Merge branch 'maint'Shawn O. Pearce2008-09-261-2/+11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Documentation: clarify the details of overriding LESS via core.pagerChris Frey2008-09-261-2/+11
* | | | | Merge branch 'jc/apply-include-exclude'Shawn O. Pearce2008-09-251-1/+13
|\ \ \ \ \
| * | | | | git-apply:--include=pathspecJunio C Hamano2008-09-061-1/+13
* | | | | | Merge branch 'ho/dirstat-by-file'Shawn O. Pearce2008-09-251-0/+3
|\ \ \ \ \ \
| * | | | | | diff --dirstat-by-file: count changed files, not linesHeikki Orsila2008-09-051-0/+3
| |/ / / / /
* | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-251-1/+17
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update release notes for 1.6.0.3Shawn O. Pearce2008-09-251-1/+17
* | | | | | git-web--browse: Support for using /bin/start on MinGWPetr Baudis2008-09-241-0/+1
* | | | | | Fixed some grammatical errors in git-rebase.txt documentation.Garry Dolley2008-09-241-4/+4
* | | | | | Update draft release notes to 1.6.1Junio C Hamano2008-09-201-1/+21
* | | | | | Merge branch 'maint'Junio C Hamano2008-09-193-34/+52
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Start draft release notes for 1.6.0.3Junio C Hamano2008-09-191-0/+29
| * | | | | git-repack uses --no-repack-object, not --no-repack-delta.Mikael Magnusson2008-09-191-1/+1
| * | | | | Bust the ghost of long-defunct diffcore-pathspec.Yann Dirson2008-09-191-33/+22
* | | | | | Merge branch 'maint'Junio C Hamano2008-09-181-9/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano2008-09-181-1/+10
| |\ \ \ \ \
| * | | | | | Clarified gitattributes documentation regarding custom hunk header.Garry Dolley2008-09-181-9/+9
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-181-0/+16
|\ \ \ \ \ \
| * | | | | | diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-301-0/+16
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bw/shortref'Junio C Hamano2008-09-181-0/+1
|\ \ \ \ \ \
| * | | | | | for-each-ref: `:short` format for `refname`Bert Wesarg2008-09-051-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs/decorate'Junio C Hamano2008-09-181-0/+1
|\ \ \ \ \ \
| * | | | | | add '%d' pretty format specifier to show decorationRené Scharfe2008-09-041-0/+1
| |/ / / / /
* | | | | | Merge branch 'jc/maint-checkout-keep-remove'Junio C Hamano2008-09-161-1/+10
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | checkout: do not lose staged removalJunio C Hamano2008-09-091-1/+10
* | | | | | Sync with 1.6.0.2Junio C Hamano2008-09-124-5/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | GIT 1.6.0.2v1.6.0.2Junio C Hamano2008-09-121-1/+3
| * | | | | Fix some manual typos.Ralf Wildenhues2008-09-123-3/+3
* | | | | | allow installation of man and html doc from the man and html branchesMichael J Gruber2008-09-101-0/+4
* | | | | | Merge branch 'maint'Junio C Hamano2008-09-101-2/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update draft release notes for 1.6.0.2Junio C Hamano2008-09-101-2/+22
| |/ / / /