Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update draft release notes to 1.7.1 | Junio C Hamano | 2010-03-20 | 1 | -2/+34 |
* | Merge branch 'ml/color-grep' | Junio C Hamano | 2010-03-20 | 1 | -3/+23 |
|\ | |||||
| * | grep: Colorize selected, context, and function lines | Mark Lodato | 2010-03-08 | 1 | -0/+6 |
| * | grep: Colorize filename, line number, and separator | Mark Lodato | 2010-03-08 | 1 | -3/+17 |
* | | Merge branch 'cc/reset-keep' | Junio C Hamano | 2010-03-20 | 1 | -1/+52 |
|\ \ | |||||
| * | | Documentation: improve description of "git reset --keep" | Junio C Hamano | 2010-03-08 | 1 | -3/+6 |
| * | | reset: disallow using --keep when there are unmerged entries | Christian Couder | 2010-03-06 | 1 | -2/+3 |
| * | | Documentation: reset: describe new "--keep" option | Christian Couder | 2010-03-06 | 1 | -1/+48 |
* | | | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 2010-03-20 | 1 | -5/+7 |
|\ \ \ | |||||
| * | | | merge-file: add option to select union merge favor | Bert Wesarg | 2010-03-02 | 1 | -6/+7 |
| * | | | merge-file: add option to specify the marker size | Bert Wesarg | 2010-03-02 | 1 | -2/+3 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-20 | 1 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | Update draft release notes to 1.7.0.3 | Junio C Hamano | 2010-03-20 | 1 | -1/+7 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-17 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Documentation: receive.denyCurrentBranch defaults to 'refuse' | Thomas Rast | 2010-03-17 | 1 | -1/+1 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-16 | 1 | -22/+24 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Documentation/git-read-tree: clarify 2-tree merge | Michael J Gruber | 2010-03-15 | 1 | -13/+15 |
| * | | | | Documentation/git-read-tree: fix table layout | Michael J Gruber | 2010-03-15 | 1 | -10/+10 |
* | | | | | Merge branch 'sd/format-patch-to' | Junio C Hamano | 2010-03-15 | 1 | -3/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Add 'git format-patch --to=' option and 'format.to' configuration variable. | Steven Drake | 2010-03-06 | 1 | -3/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'tc/transport-verbosity' | Junio C Hamano | 2010-03-15 | 5 | -6/+33 |
|\ \ \ \ \ | |||||
| * | | | | | fetch and pull: learn --progress | Tay Ray Chuan | 2010-02-24 | 2 | -2/+11 |
| * | | | | | push: learn --progress | Tay Ray Chuan | 2010-02-24 | 1 | -1/+8 |
| * | | | | | Documentation/git-push: put --quiet before --verbose | Tay Ray Chuan | 2010-02-24 | 1 | -4/+4 |
| * | | | | | Documentation/git-pull: put verbosity options before merge/fetch ones | Tay Ray Chuan | 2010-02-24 | 2 | -0/+10 |
| * | | | | | Documentation/git-clone: mention progress in -v | Tay Ray Chuan | 2010-02-24 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'jh/notes' | Junio C Hamano | 2010-03-15 | 1 | -18/+73 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: fix a few typos in git-notes.txt | Michael J Gruber | 2010-03-04 | 1 | -2/+2 |
| * | | | | | builtin-notes: Add "copy" subcommand for copying notes between objects | Johan Herland | 2010-02-13 | 1 | -0/+8 |
| * | | | | | builtin-notes: Add -c/-C options for reusing notes | Johan Herland | 2010-02-13 | 1 | -2/+10 |
| * | | | | | builtin-notes: Deprecate the -m/-F options for "git notes edit" | Johan Herland | 2010-02-13 | 1 | -1/+1 |
| * | | | | | builtin-notes: Add "append" subcommand for appending to note objects | Johan Herland | 2010-02-13 | 1 | -0/+5 |
| * | | | | | builtin-notes: Add "add" subcommand for adding notes to objects | Johan Herland | 2010-02-13 | 1 | -0/+11 |
| * | | | | | builtin-notes: Add --message/--file aliases for -m/-F options | Johan Herland | 2010-02-13 | 1 | -0/+2 |
| * | | | | | builtin-notes: Add "list" subcommand for listing note objects | Johan Herland | 2010-02-13 | 1 | -1/+12 |
| * | | | | | Documentation: Generalize git-notes docs to 'objects' instead of 'commits' | Johan Herland | 2010-02-13 | 1 | -15/+20 |
| * | | | | | builtin-notes: Add "prune" subcommand for removing notes for missing objects | Johan Herland | 2010-02-13 | 1 | -1/+3 |
| * | | | | | builtin-notes: Add "remove" subcommand for removing existing notes | Johan Herland | 2010-02-13 | 1 | -5/+10 |
| * | | | | | Builtin-ify git-notes | Johan Herland | 2010-02-13 | 1 | -4/+2 |
* | | | | | | Merge branch 'sd/init-template' | Junio C Hamano | 2010-03-10 | 3 | -10/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add a "TEMPLATE DIRECTORY" section to git-init[1]. | Steven Drake | 2010-02-17 | 3 | -10/+26 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'sh/am-keep-cr' | Junio C Hamano | 2010-03-10 | 3 | -2/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-am: Add am.keepcr and --no-keep-cr to override it | Stefan-W. Hahn | 2010-02-28 | 2 | -2/+11 |
| * | | | | | | git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit | Stefan-W. Hahn | 2010-02-28 | 1 | -1/+6 |
| * | | | | | | documentation: 'git-mailsplit --keep-cr' is not hidden anymore | Stefan-W. Hahn | 2010-02-28 | 1 | -1/+4 |
* | | | | | | | Update draft release notes to 1.7.1 | Junio C Hamano | 2010-03-08 | 1 | -3/+21 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-08 | 1 | -0/+34 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge accumulated fixes to prepare for 1.7.0.3 | Junio C Hamano | 2010-03-08 | 1 | -0/+34 |
| * | | | | | | Merge branch 'gb/maint-submodule-env' into maint | Junio C Hamano | 2010-03-08 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ml/maint-grep-doc' into maint | Junio C Hamano | 2010-03-08 | 1 | -13/+17 |
| |\ \ \ \ \ \ \ |