summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Sync with 1.7.5.1Junio C Hamano2011-05-043-1/+37
|\
| * Git 1.7.5.1v1.7.5.1Junio C Hamano2011-05-042-1/+35
| * Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-041-0/+4
| |\
| * \ Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-041-2/+0
| |\ \
| * | | git-add.txt: document 'add.ignoreErrors'Valentin Haenel2011-05-041-0/+2
* | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-021-5/+15
* | | | Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-022-12/+27
|\ \ \ \
| * | | | log/pretty-options: Document --[no-]notes and deprecate old notes optionsJohan Herland2011-03-302-12/+27
* | | | | Merge branch 'nm/submodule-update-force'Junio C Hamano2011-05-021-2/+4
|\ \ \ \ \
| * | | | | submodule: Add --force option for git submodule updateNicolas Morey-Chaisemartin2011-04-041-2/+4
* | | | | | Merge branch 'jh/notes-add-ui'Junio C Hamano2011-05-021-2/+5
|\ \ \ \ \ \
| * | | | | | Make "git notes add" more user-friendly when there are existing notesJohan Herland2011-03-301-2/+5
| | |/ / / / | |/| | | |
* | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-011-2/+7
* | | | | | Merge branch 'vh/git-svn-doc'Junio C Hamano2011-05-011-11/+11
|\ \ \ \ \ \
| * | | | | | git-svn.txt: small typeface improvementsValentin Haenel2011-04-261-4/+4
| * | | | | | git-svn.txt: move option descriptionsValentin Haenel2011-04-261-11/+11
| * | | | | | git-svn.txt: fix usage of --add-author-fromValentin Haenel2011-04-261-1/+1
* | | | | | | Merge branch 'maint'Junio C Hamano2011-04-291-0/+14
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Start 1.7.5.1 maintenance trackJunio C Hamano2011-04-291-0/+14
| |/ / / / /
* | | | | | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-281-0/+13
|\ \ \ \ \ \
| * | | | | | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-021-0/+13
* | | | | | | Merge branch 'mz/rebase'Junio C Hamano2011-04-282-3/+10
|\ \ \ \ \ \ \
| * | | | | | | rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-102-3/+10
* | | | | | | | Merge branch 'jh/dirstat'Junio C Hamano2011-04-281-0/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-111-2/+2
| * | | | | | | --dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland2011-04-111-0/+4
* | | | | | | | Start 1.7.6 cycleJunio C Hamano2011-04-271-0/+79
* | | | | | | | Merge branch 'cn/format-patch-quiet'Junio C Hamano2011-04-271-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: document --quiet optionCarlos Martín Nieto2011-04-121-1/+4
* | | | | | | | | Merge branch 'rr/doc-content-type'Junio C Hamano2011-04-272-62/+103
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: Allow custom diff tools to be specified in 'diff.tool'Ramkumar Ramachandra2011-04-061-6/+8
| * | | | | | | | | Documentation: Add diff.<driver>.* to configRamkumar Ramachandra2011-04-061-0/+28
| * | | | | | | | | Documentation: Move diff.<driver>.* from config.txt to diff-config.txtRamkumar Ramachandra2011-04-062-62/+63
| * | | | | | | | | Documentation: Add filter.<driver>.* to configRamkumar Ramachandra2011-04-061-0/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nk/blame-abbrev'Junio C Hamano2011-04-271-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: add --abbrev command line option and make it honor core.abbrevNamhyung Kim2011-04-051-1/+6
* | | | | | | | | | Merge branch 'jc/pack-objects-bigfile'Junio C Hamano2011-04-271-2/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Teach core.bigfilethreashold to pack-objectsJunio C Hamano2011-04-051-2/+0
* | | | | | | | | | Merge branch 'mh/git-svn-automkdirs'Junio C Hamano2011-04-271-0/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | git-svn: add an option to skip the creation of empty directoriesMichael Haggerty2011-04-011-0/+10
* | | | | | | | | | Git 1.7.5v1.7.5Junio C Hamano2011-04-231-0/+5
* | | | | | | | | | Git 1.7.5-rc3v1.7.5-rc3Junio C Hamano2011-04-192-8/+3
* | | | | | | | | | Sync with 1.7.4.5Junio C Hamano2011-04-192-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git 1.7.4.5v1.7.4.5Junio C Hamano2011-04-191-0/+4
| * | | | | | | | | | git-svn.txt: Document --mergeinfoMichael J Gruber2011-04-191-0/+7
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-04-142-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | archive: document limitation of tar.umask config settingRené Scharfe2011-04-141-1/+2
| * | | | | | | | | | git.txt: fix list continuationMichael J Gruber2011-04-141-1/+0
| * | | | | | | | | | Merge branch 'jc/rev-list-options-fix' into maintJunio C Hamano2011-04-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Git 1.7.5-rc2v1.7.5-rc2Junio C Hamano2011-04-131-2/+2