summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 1.7.1Junio C Hamano2010-03-201-2/+34
* Merge branch 'ml/color-grep'Junio C Hamano2010-03-201-3/+23
|\
| * grep: Colorize selected, context, and function linesMark Lodato2010-03-081-0/+6
| * grep: Colorize filename, line number, and separatorMark Lodato2010-03-081-3/+17
* | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-201-1/+52
|\ \
| * | Documentation: improve description of "git reset --keep"Junio C Hamano2010-03-081-3/+6
| * | reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-061-2/+3
| * | Documentation: reset: describe new "--keep" optionChristian Couder2010-03-061-1/+48
* | | Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-201-5/+7
|\ \ \
| * | | merge-file: add option to select union merge favorBert Wesarg2010-03-021-6/+7
| * | | merge-file: add option to specify the marker sizeBert Wesarg2010-03-021-2/+3
* | | | Merge branch 'maint'Junio C Hamano2010-03-201-1/+7
|\ \ \ \
| * | | | Update draft release notes to 1.7.0.3Junio C Hamano2010-03-201-1/+7
* | | | | Merge branch 'maint'Junio C Hamano2010-03-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Documentation: receive.denyCurrentBranch defaults to 'refuse'Thomas Rast2010-03-171-1/+1
* | | | | Merge branch 'maint'Junio C Hamano2010-03-161-22/+24
|\ \ \ \ \ | |/ / / /
| * | | | Documentation/git-read-tree: clarify 2-tree mergeMichael J Gruber2010-03-151-13/+15
| * | | | Documentation/git-read-tree: fix table layoutMichael J Gruber2010-03-151-10/+10
* | | | | Merge branch 'sd/format-patch-to'Junio C Hamano2010-03-151-3/+8
|\ \ \ \ \
| * | | | | Add 'git format-patch --to=' option and 'format.to' configuration variable.Steven Drake2010-03-061-3/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'tc/transport-verbosity'Junio C Hamano2010-03-155-6/+33
|\ \ \ \ \
| * | | | | fetch and pull: learn --progressTay Ray Chuan2010-02-242-2/+11
| * | | | | push: learn --progressTay Ray Chuan2010-02-241-1/+8
| * | | | | Documentation/git-push: put --quiet before --verboseTay Ray Chuan2010-02-241-4/+4
| * | | | | Documentation/git-pull: put verbosity options before merge/fetch onesTay Ray Chuan2010-02-242-0/+10
| * | | | | Documentation/git-clone: mention progress in -vTay Ray Chuan2010-02-241-1/+2
| |/ / / /
* | | | | 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
| |\ \ \ \ \ \ \