summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jh/notes'Junio C Hamano2010-03-151-18/+73
|\
| * Documentation: fix a few typos in git-notes.txtMichael J Gruber2010-03-041-2/+2
| * builtin-notes: Add "copy" subcommand for copying notes between objectsJohan Herland2010-02-131-0/+8
| * builtin-notes: Add -c/-C options for reusing notesJohan Herland2010-02-131-2/+10
| * builtin-notes: Deprecate the -m/-F options for "git notes edit"Johan Herland2010-02-131-1/+1
| * builtin-notes: Add "append" subcommand for appending to note objectsJohan Herland2010-02-131-0/+5
| * builtin-notes: Add "add" subcommand for adding notes to objectsJohan Herland2010-02-131-0/+11
| * builtin-notes: Add --message/--file aliases for -m/-F optionsJohan Herland2010-02-131-0/+2
| * builtin-notes: Add "list" subcommand for listing note objectsJohan Herland2010-02-131-1/+12
| * Documentation: Generalize git-notes docs to 'objects' instead of 'commits'Johan Herland2010-02-131-15/+20
| * builtin-notes: Add "prune" subcommand for removing notes for missing objectsJohan Herland2010-02-131-1/+3
| * builtin-notes: Add "remove" subcommand for removing existing notesJohan Herland2010-02-131-5/+10
| * Builtin-ify git-notesJohan Herland2010-02-131-4/+2
* | Merge branch 'sd/init-template'Junio C Hamano2010-03-103-10/+26
|\ \
| * | Add a "TEMPLATE DIRECTORY" section to git-init[1].Steven Drake2010-02-173-10/+26
* | | Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-103-2/+19
|\ \ \
| * | | git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn2010-02-282-2/+11
| * | | git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitStefan-W. Hahn2010-02-281-1/+6
| * | | documentation: 'git-mailsplit --keep-cr' is not hidden anymoreStefan-W. Hahn2010-02-281-1/+4
* | | | Update draft release notes to 1.7.1Junio C Hamano2010-03-081-3/+21
* | | | Merge branch 'maint'Junio C Hamano2010-03-081-0/+34
|\ \ \ \
| * | | | Merge accumulated fixes to prepare for 1.7.0.3Junio C Hamano2010-03-081-0/+34
| * | | | Merge branch 'gb/maint-submodule-env' into maintJunio C Hamano2010-03-081-0/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'ml/maint-grep-doc' into maintJunio C Hamano2010-03-081-13/+17
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ne/pack-local-doc' into maintJunio C Hamano2010-03-081-8/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/checkout-detached' into maintJunio C Hamano2010-03-081-0/+5
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'ml/maint-grep-doc'Junio C Hamano2010-03-071-13/+17
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | grep docs: document --no-index optionMark Lodato2010-02-251-4/+8
| * | | | | | | | grep docs: --cached and <tree>... are incompatibleMark Lodato2010-02-251-3/+3
| * | | | | | | | grep docs: use AsciiDoc literals consistentlyMark Lodato2010-02-251-5/+5
| * | | | | | | | grep docs: pluralize "Example" sectionMark Lodato2010-02-251-2/+2
* | | | | | | | | Merge branch 'gb/maint-submodule-env'Junio C Hamano2010-03-071-0/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | rev-parse: --local-env-vars optionGiuseppe Bilotta2010-02-241-0/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ne/pack-local-doc'Junio C Hamano2010-03-071-8/+7
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | pack-objects documentation: Fix --honor-pack-keep as well.Nelson Elhage2010-02-241-2/+2
| * | | | | | | pack-objects documentation: reword "objects that appear in the standard input"Junio C Hamano2010-02-241-3/+3
| * | | | | | | Documentation: pack-objects: Clarify --local's semantics.Nelson Elhage2010-02-201-5/+4
* | | | | | | | Sync with 1.7.0.2Junio C Hamano2010-03-072-7/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Git 1.7.0.2v1.7.0.2Junio C Hamano2010-03-072-7/+2
* | | | | | | | hash-object: support --stdin-paths with --no-filtersErik Faye-Lund2010-03-051-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-03-042-2/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Update draft release notes to 1.7.0.2Junio C Hamano2010-03-041-1/+25
| * | | | | | | Merge branch 'jn/maint-fix-pager' into maintJunio C Hamano2010-03-042-3/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-041-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-03-041-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Remove extra '-' from git-am(1)Michal Sojka2010-03-041-1/+1
| | | * | | | | | | | Merge branch 'bg/maint-add-all-doc' into maint-1.6.5Junio C Hamano2010-02-012-29/+88
| | | |\ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2010-03-031-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Start preparing for 1.7.0.2Junio C Hamano2010-03-021-0/+22
| * | | | | | | | | | | Merge branch 'sp/maint-push-sideband' into maintJunio C Hamano2010-03-021-11/+41
| |\ \ \ \ \ \ \ \ \ \ \