summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2010-03-042-2/+26
|\
| * Update draft release notes to 1.7.0.2Junio C Hamano2010-03-041-1/+25
| * Merge branch 'jn/maint-fix-pager' into maintJunio C Hamano2010-03-042-3/+7
| |\
| * \ Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-041-1/+1
| |\ \
| | * \ Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-03-041-1/+1
| | |\ \
| | | * | Remove extra '-' from git-am(1)Michal Sojka2010-03-041-1/+1
| | | * | Merge branch 'bg/maint-add-all-doc' into maint-1.6.5Junio C Hamano2010-02-012-29/+88
| | | |\ \
* | | | \ \ Merge branch 'maint'Junio C Hamano2010-03-031-0/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Start preparing for 1.7.0.2Junio C Hamano2010-03-021-0/+22
| * | | | | Merge branch 'sp/maint-push-sideband' into maintJunio C Hamano2010-03-021-11/+41
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'np/fast-import-idx-v2' into maintJunio C Hamano2010-03-021-4/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jn/maint-fix-pager'Junio C Hamano2010-03-022-3/+7
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | git.1: Clarify the behavior of the --paginate optionJonathan Nieder2010-02-141-2/+6
| * | | | | | | Fix 'git var' usage synopsisJonathan Nieder2010-02-141-1/+1
* | | | | | | | Merge branch 'hm/imap-send-cram-md5'Junio C Hamano2010-03-021-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | imap-send: support CRAM-MD5 authenticationHitoshi Mitake2010-02-171-0/+4
* | | | | | | | | Merge branch 'ml/color-when'Junio C Hamano2010-03-025-7/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add an optional argument for --color optionsMark Lodato2010-02-185-7/+27
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ac/cvsimport-revision-mapping'Junio C Hamano2010-03-021-1/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cvsimport: new -R option: generate .git/cvs-revisions mappingAaron Crane2010-02-061-1/+17
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-283-9/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Git 1.7.0.1v1.7.0.1Junio C Hamano2010-02-282-6/+11
| * | | | | | | | | Remove reference to GREP_COLORS from documentationMark Lodato2010-02-281-3/+1
| * | | | | | | | | Merge branch 'ml/maint-grep-doc' into maintJunio C Hamano2010-02-241-5/+12
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2010-02-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg2010-02-231-1/+2
* | | | | | | | | | | Merge branch 'ml/maint-grep-doc'Junio C Hamano2010-02-211-5/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | grep documentation: clarify what files matchMark Lodato2010-02-161-5/+12
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sp/push-sideband'Junio C Hamano2010-02-211-11/+41
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-push-sideband' into sp/push-sidebandJunio C Hamano2010-02-051-11/+41
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | run-command: support custom fd-set in asyncErik Faye-Lund2010-02-051-10/+40
| | * | | | | | | | run-command: Allow stderr to be a caller supplied pipeShawn O. Pearce2010-02-051-1/+1
* | | | | | | | | | Merge branch 'jc/checkout-detached'Junio C Hamano2010-02-211-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reword "detached HEAD" notificationJunio C Hamano2010-01-291-0/+5
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Documentation: Fix indentation problem in git-commit(1)Jacob Helwig2010-02-191-3/+3
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-195-28/+36
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Documentation: describe --thin more accuratelyStephen Boyd2010-02-185-28/+36
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-1710-36/+39
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | docs: don't talk about $GIT_DIR/refs/ everywhereJeff King2010-02-1710-36/+39
* | | | | | | | | | | Merge branch 'np/fast-import-idx-v2'Junio C Hamano2010-02-171-4/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | fast-import: make default pack size unlimitedNicolas Pitre2010-02-171-4/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Update draft release notes to 1.7.1Junio C Hamano2010-02-171-1/+4
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Update 1.7.0.1 release notesJunio C Hamano2010-02-171-1/+1
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-161-1/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Prepare 1.7.0.1 release notesJunio C Hamano2010-02-161-1/+21
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-131-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Start 1.7.0 maintenance trackJunio C Hamano2010-02-131-0/+11
| |/ / / / / / /
* | | | | | | | Start 1.7.1 cycleJunio C Hamano2010-02-131-0/+17
|/ / / / / / /