Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 |
|\ | |||
| * | git-notes(1): add a section about the meaning of history | Thomas Rast | 2010-03-12 |
| * | notes: add shorthand --ref to override GIT_NOTES_REF | Thomas Rast | 2010-03-12 |
| * | notes: implement helpers needed for note copying during rewrite | Thomas Rast | 2010-03-12 |
| * | notes: implement 'git notes copy --stdin' | Thomas Rast | 2010-03-12 |
| * | Documentation: document post-rewrite hook | Thomas Rast | 2010-03-12 |
| * | Support showing notes from more than one notes tree | Thomas Rast | 2010-03-12 |
| * | Merge branch 'il/rev-glob' | Junio C Hamano | 2010-02-23 |
| |\ | |||
* | \ | Merge branch 'pb/log-first-parent-p-m' | Junio C Hamano | 2010-03-24 |
|\ \ \ | |||
| * | | | git log -p -m: document -m and honor --first-parent | Petr Baudis | 2010-02-12 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-24 |
|\ \ \ \ | |||
| * | | | | Documentation: explain the meaning of "-g" in git-describe output | Markus Heidelberg | 2010-03-24 |
* | | | | | Sync with Git 1.7.0.3 | Junio C Hamano | 2010-03-21 |
|\ \ \ \ \ | |/ / / / | |||
| * | | | | Git 1.7.0.3v1.7.0.3 | Junio C Hamano | 2010-03-21 |
| * | | | | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-03-21 |
| |\ \ \ \ | |||
| | * | | | | Documentation/git-clone: Transform description list into item list | Michael J Gruber | 2010-03-21 |
| | * | | | | Documentation/urls: Remove spurious example markers | Michael J Gruber | 2010-03-21 |
| | * | | | | Documentation/gitdiffcore: Remove misleading date in heading | Michael J Gruber | 2010-03-21 |
| | * | | | | Documentation/git-reflog: Fix formatting of command lists | Michael J Gruber | 2010-03-21 |
| | * | | | | Merge branch 'sp/maint-push-sideband' into maint-1.6.6 | Junio C Hamano | 2010-03-07 |
| | |\ \ \ \ | |||
* | | | | | | | Update draft release notes to 1.7.1 | Junio C Hamano | 2010-03-20 |
* | | | | | | | Merge branch 'ml/color-grep' | Junio C Hamano | 2010-03-20 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | grep: Colorize selected, context, and function lines | Mark Lodato | 2010-03-08 |
| * | | | | | | | grep: Colorize filename, line number, and separator | Mark Lodato | 2010-03-08 |
* | | | | | | | | Merge branch 'cc/reset-keep' | Junio C Hamano | 2010-03-20 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Documentation: improve description of "git reset --keep" | Junio C Hamano | 2010-03-08 |
| * | | | | | | | | reset: disallow using --keep when there are unmerged entries | Christian Couder | 2010-03-06 |
| * | | | | | | | | Documentation: reset: describe new "--keep" option | Christian Couder | 2010-03-06 |
* | | | | | | | | | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 2010-03-20 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | merge-file: add option to select union merge favor | Bert Wesarg | 2010-03-02 |
| * | | | | | | | | | merge-file: add option to specify the marker size | Bert Wesarg | 2010-03-02 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-20 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Update draft release notes to 1.7.0.3 | Junio C Hamano | 2010-03-20 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-17 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||
| * | | | | | | | | | Documentation: receive.denyCurrentBranch defaults to 'refuse' | Thomas Rast | 2010-03-17 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-16 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||
| * | | | | | | | | | Documentation/git-read-tree: clarify 2-tree merge | Michael J Gruber | 2010-03-15 |
| * | | | | | | | | | Documentation/git-read-tree: fix table layout | Michael J Gruber | 2010-03-15 |
* | | | | | | | | | | Merge branch 'sd/format-patch-to' | Junio C Hamano | 2010-03-15 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Add 'git format-patch --to=' option and 'format.to' configuration variable. | Steven Drake | 2010-03-06 |
| | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'tc/transport-verbosity' | Junio C Hamano | 2010-03-15 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fetch and pull: learn --progress | Tay Ray Chuan | 2010-02-24 |
| * | | | | | | | | | | push: learn --progress | Tay Ray Chuan | 2010-02-24 |
| * | | | | | | | | | | Documentation/git-push: put --quiet before --verbose | Tay Ray Chuan | 2010-02-24 |
| * | | | | | | | | | | Documentation/git-pull: put verbosity options before merge/fetch ones | Tay Ray Chuan | 2010-02-24 |
| * | | | | | | | | | | Documentation/git-clone: mention progress in -v | Tay Ray Chuan | 2010-02-24 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'jh/notes' | Junio C Hamano | 2010-03-15 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Documentation: fix a few typos in git-notes.txt | Michael J Gruber | 2010-03-04 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | builtin-notes: Add "copy" subcommand for copying notes between objects | Johan Herland | 2010-02-13 |
| * | | | | | | | | | builtin-notes: Add -c/-C options for reusing notes | Johan Herland | 2010-02-13 |