Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | diff: cache textconv output | Jeff King | 2010-04-02 | 1 | -0/+20 |
* | Sync with 1.7.0.4 | Junio C Hamano | 2010-03-31 | 4 | -5/+14 |
|\ | |||||
| * | Git 1.7.0.4v1.7.0.4 | Junio C Hamano | 2010-03-31 | 2 | -3/+12 |
| * | Documentation: show-ref <pattern>s are optional | Holger Weiß | 2010-03-31 | 1 | -1/+1 |
| * | Documentation: Clarify support for smart HTTP backend | Greg Bacon | 2010-03-30 | 1 | -1/+1 |
* | | Update draft release notes to 1.7.1 | Junio C Hamano | 2010-03-28 | 1 | -9/+10 |
* | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | 1 | -1/+5 |
|\ \ | |||||
| * | | Documentation: describe new cherry-pick --ff option | Christian Couder | 2010-03-06 | 1 | -1/+5 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-03-28 | 1 | -0/+19 |
|\ \ \ | | |/ | |/| | |||||
| * | | Prepare for 1.7.0.4 | Junio C Hamano | 2010-03-28 | 1 | -0/+19 |
* | | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 4 | -9/+139 |
|\ \ \ | |||||
| * | | | git-notes(1): add a section about the meaning of history | Thomas Rast | 2010-03-12 | 1 | -0/+14 |
| * | | | notes: add shorthand --ref to override GIT_NOTES_REF | Thomas Rast | 2010-03-12 | 1 | -0/+5 |
| * | | | notes: implement helpers needed for note copying during rewrite | Thomas Rast | 2010-03-12 | 3 | -0/+38 |
| * | | | notes: implement 'git notes copy --stdin' | Thomas Rast | 2010-03-12 | 1 | -1/+11 |
| * | | | Documentation: document post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -0/+34 |
| * | | | Support showing notes from more than one notes tree | Thomas Rast | 2010-03-12 | 3 | -8/+37 |
| * | | | Merge branch 'il/rev-glob' | Junio C Hamano | 2010-02-23 | 4 | -17/+52 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'pb/log-first-parent-p-m' | Junio C Hamano | 2010-03-24 | 3 | -3/+22 |
|\ \ \ \ \ | |||||
| * | | | | | git log -p -m: document -m and honor --first-parent | Petr Baudis | 2010-02-12 | 3 | -3/+22 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-24 | 1 | -0/+3 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Documentation: explain the meaning of "-g" in git-describe output | Markus Heidelberg | 2010-03-24 | 1 | -0/+3 |
* | | | | | | Sync with Git 1.7.0.3 | Junio C Hamano | 2010-03-21 | 7 | -24/+11 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Git 1.7.0.3v1.7.0.3 | Junio C Hamano | 2010-03-21 | 2 | -9/+4 |
| * | | | | | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-03-21 | 4 | -14/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Documentation/git-clone: Transform description list into item list | Michael J Gruber | 2010-03-21 | 1 | -5/+5 |
| | * | | | | | Documentation/urls: Remove spurious example markers | Michael J Gruber | 2010-03-21 | 1 | -6/+0 |
| | * | | | | | Documentation/gitdiffcore: Remove misleading date in heading | Michael J Gruber | 2010-03-21 | 1 | -1/+1 |
| | * | | | | | Documentation/git-reflog: Fix formatting of command lists | Michael J Gruber | 2010-03-21 | 1 | -2/+0 |
| | * | | | | | Merge branch 'sp/maint-push-sideband' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 1 | -11/+41 |
| | |\ \ \ \ \ | |||||
* | | | | | | | | 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 |
| | |/ / / / / / / / / | |/| | | | | | | | | |