summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 1.7.1Junio C Hamano2010-03-281-9/+10
* Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-281-1/+5
|\
| * Documentation: describe new cherry-pick --ff optionChristian Couder2010-03-061-1/+5
* | Merge branch 'maint'Junio C Hamano2010-03-281-0/+19
|\ \
| * | Prepare for 1.7.0.4Junio C Hamano2010-03-281-0/+19
* | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-244-9/+139
|\ \ \
| * | | git-notes(1): add a section about the meaning of historyThomas Rast2010-03-121-0/+14
| * | | notes: add shorthand --ref to override GIT_NOTES_REFThomas Rast2010-03-121-0/+5
| * | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-123-0/+38
| * | | notes: implement 'git notes copy --stdin'Thomas Rast2010-03-121-1/+11
| * | | Documentation: document post-rewrite hookThomas Rast2010-03-121-0/+34
| * | | Support showing notes from more than one notes treeThomas Rast2010-03-123-8/+37
| * | | Merge branch 'il/rev-glob'Junio C Hamano2010-02-234-17/+52
| |\ \ \
* | \ \ \ Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-243-3/+22
|\ \ \ \ \
| * | | | | git log -p -m: document -m and honor --first-parentPetr Baudis2010-02-123-3/+22
* | | | | | Merge branch 'maint'Junio C Hamano2010-03-241-0/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Documentation: explain the meaning of "-g" in git-describe outputMarkus Heidelberg2010-03-241-0/+3
* | | | | | Sync with Git 1.7.0.3Junio C Hamano2010-03-217-24/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Git 1.7.0.3v1.7.0.3Junio C Hamano2010-03-212-9/+4
| * | | | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-214-14/+6
| |\ \ \ \ \
| | * | | | | Documentation/git-clone: Transform description list into item listMichael J Gruber2010-03-211-5/+5
| | * | | | | Documentation/urls: Remove spurious example markersMichael J Gruber2010-03-211-6/+0
| | * | | | | Documentation/gitdiffcore: Remove misleading date in headingMichael J Gruber2010-03-211-1/+1
| | * | | | | Documentation/git-reflog: Fix formatting of command listsMichael J Gruber2010-03-211-2/+0
| | * | | | | Merge branch 'sp/maint-push-sideband' into maint-1.6.6Junio C Hamano2010-03-071-11/+41
| | |\ \ \ \ \
* | | | | | | | 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