summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rr/core-tutorial'Junio C Hamano2010-01-201-0/+8
|\
| * Documentation: Update git core tutorial clarifying reference to scriptsRamkumar Ramachandra2010-01-161-0/+8
* | Merge branch 'jc/grep-lookahead'Junio C Hamano2010-01-201-8/+0
|\ \
| * | grep: rip out support for external grepJunio C Hamano2010-01-131-8/+0
| |/
* | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-0/+4
|\ \
| * | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+4
| |/
* | Merge branch 'da/difftool'Junio C Hamano2010-01-202-1/+20
|\ \
| * | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-151-1/+2
| * | git-diff.txt: Link to git-difftoolDavid Aguilar2010-01-091-0/+4
| * | difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-0/+5
| * | git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-031-0/+9
| |/
* | Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-201-0/+10
|\ \
| * | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-061-0/+10
* | | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-201-5/+8
|\ \ \ | |/ /
| * | Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-071-5/+8
* | | Merge branch 'il/push-set-upstream'Junio C Hamano2010-01-201-1/+8
|\ \ \
| * | | Add push --set-upstreamIlari Liusvaara2010-01-161-1/+8
* | | | Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano2010-01-203-0/+16
|\ \ \ \
| * | | | commit: allow suppression of implicit identity adviceJeff King2010-01-141-0/+4
| * | | | strbuf: add strbuf_addbuf_percentquoteJeff King2010-01-141-0/+7
| * | | | strbuf_expand: convert "%%" to "%"Jeff King2010-01-142-0/+5
| | |_|/ | |/| |
* | | | Merge branch 'sd/cd-p-show-toplevel'Junio C Hamano2010-01-201-0/+3
|\ \ \ \
| * | | | Add 'git rev-parse --show-toplevel' option.Steven Drake2010-01-111-0/+3
| |/ / /
* | | | Sync with 1.6.6.1Junio C Hamano2010-01-203-8/+45
|\ \ \ \
| * | | | Git 1.6.6.1v1.6.6.1Junio C Hamano2010-01-202-7/+15
| * | | | Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano2010-01-202-29/+88
| |\ \ \ \
| * \ \ \ \ Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-202-1/+30
| |\ \ \ \ \
| | * | | | | Git 1.6.5.8v1.6.5.8Junio C Hamano2010-01-202-1/+30
* | | | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-181-1/+16
* | | | | | | Merge branch 'maint'Junio C Hamano2010-01-181-1/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update draft release notes to 1.6.6.1Junio C Hamano2010-01-181-1/+16
* | | | | | | Merge branch 'jc/rerere'Junio C Hamano2010-01-181-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-1/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-171-1/+38
* | | | | | | Merge branch 'jh/commit-status'Junio C Hamano2010-01-172-1/+18
|\ \ \ \ \ \ \
| * | | | | | | commit: support commit.status, --status, and --no-statusJames P. Howard, II2010-01-132-1/+18
* | | | | | | | Merge branch 'jn/makefile'Junio C Hamano2010-01-171-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: consolidate .FORCE-* targetsJonathan Nieder2010-01-061-2/+2
* | | | | | | | | Merge branch 'tc/clone-v-progress'Junio C Hamano2010-01-171-3/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: use --progress to force progress reportingTay Ray Chuan2009-12-281-0/+3
| * | | | | | | | | git-clone.txt: reword description of progress behaviourTay Ray Chuan2009-12-281-3/+6
| * | | | | | | | | check stderr with isatty() instead of stdout when deciding to show progressTay Ray Chuan2009-12-281-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'tc/smart-http-restrict'Junio C Hamano2010-01-171-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Smart-http: check if repository is OK to export before serving itTarmigan Casebolt2010-01-061-0/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sr/gfi-options'Junio C Hamano2010-01-171-0/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-import: add (non-)relative-marks featureSverre Rabbelier2009-12-051-0/+16
| * | | | | | | | | fast-import: allow for multiple --import-marks= argumentsSverre Rabbelier2009-12-041-1/+7
| * | | | | | | | | fast-import: add option commandSverre Rabbelier2009-12-041-0/+32
| * | | | | | | | | fast-import: add feature commandSverre Rabbelier2009-12-041-0/+25
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-162-3/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |