summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* clone: add --branch option to select a different HEADJeff King2009-08-273-28/+122
* Merge branch 'maint'Junio C Hamano2009-08-264-12/+13
|\
| * git-log: allow --decorate[=short|full]Lars Hjemli2009-08-269-10/+65
| * Minor improvement to the write-tree documentationDavid Kågedal2009-08-261-1/+2
| * git-bisect: call the found commit "*the* first bad commit"Nanako Shiraishi2009-08-263-11/+11
| * Merge branch 'js/maint-cover-letter-non-ascii' into maintJunio C Hamano2009-08-264-12/+17
| |\
| * \ Merge branch 'jc/maint-clean-nested-dir-safety' into maintJunio C Hamano2009-08-266-5/+63
| |\ \
| * \ \ Merge branch 'jk/maint-merge-msg-fix' into maintJunio C Hamano2009-08-264-11/+75
| |\ \ \
| * \ \ \ Merge branch 'jc/apply-epoch-patch' into maintJunio C Hamano2009-08-262-1/+176
| |\ \ \ \
| * \ \ \ \ Merge branch 'jp/symlink-dirs' into maintJunio C Hamano2009-08-264-1/+114
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-262-0/+15
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3Junio C Hamano2009-08-262-0/+15
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'aj/fix-read-tree-from-scratch'Junio C Hamano2009-08-252-4/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | read-tree: Fix regression with creation of a new index file.Alexandre Julliard2009-08-172-4/+31
* | | | | | | | | | Merge branch 'jc/maint-checkout-index-to-prefix'Junio C Hamano2009-08-253-5/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | check_path(): allow symlinked directories to checkout-index --prefixJunio C Hamano2009-08-183-5/+18
* | | | | | | | | | | Merge branch 'jl/submodule-summary-diff-files'Junio C Hamano2009-08-253-5/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentaqtion/git-submodule.txt: TypofixLars Hjemli2009-08-151-1/+1
| * | | | | | | | | | | git submodule summary: add --files optionJens Lehmann2009-08-153-5/+49
* | | | | | | | | | | | Merge branch 'lh/short-decorate'Junio C Hamano2009-08-259-10/+65
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-log: allow --decorate[=short|full]Lars Hjemli2009-08-189-10/+65
* | | | | | | | | | | | | Merge branch 'oa/stash-na'Junio C Hamano2009-08-251-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git stash: Give friendlier errors when there is nothing to applyOri Avtalion2009-08-151-11/+16
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Documentation: consistently refer to check-ref-formatNanako Shiraishi2009-08-252-6/+20
* | | | | | | | | | | | | Merge branch 'jc/verify-pack-stat'Junio C Hamano2009-08-242-17/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | verify-pack --stat-only: show histogram without verifyingJunio C Hamano2009-08-082-17/+40
| * | | | | | | | | | | | | Merge branch 'maint' into jc/verify-pack-statJunio C Hamano2009-08-0885-457/+1381
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mr/gitweb-xz'Junio C Hamano2009-08-242-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gitweb: add support for XZ compressed snapshotsMark A Rada2009-08-061-0/+9
| * | | | | | | | | | | | | | | gitweb: update INSTALL regarding specific snapshot settingsMark A Rada2009-08-061-0/+9
| * | | | | | | | | | | | | | | gitweb: support to globally disable a snapshot formatMark A Rada2009-08-061-2/+6
* | | | | | | | | | | | | | | | Merge branch 'ld/p4'Junio C Hamano2009-08-241-67/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-p4: stream from perforce to speed up clonesLuke Diamand2009-08-101-67/+102
* | | | | | | | | | | | | | | | | gitweb: pull ref markes pull out of subject <a> elementGiuseppe Bilotta2009-08-231-2/+2
* | | | | | | | | | | | | | | | | Sync with 1.6.4.1Junio C Hamano2009-08-222-1/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | GIT 1.6.4.1v1.6.4.1Junio C Hamano2009-08-224-3/+50
| * | | | | | | | | | | | | | | | Merge branch 'bc/maint-am-email' into maintJunio C Hamano2009-08-222-1/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-merge-recursive-fix' into maintJunio C Hamano2009-08-212-3/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'zf/maint-gitweb-acname' into maintJunio C Hamano2009-08-211-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'np/maint-limit-delta-cache' into maintJunio C Hamano2009-08-212-4/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-show-tag' into maintJunio C Hamano2009-08-211-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/maint-pull-rebase' into maintJunio C Hamano2009-08-212-3/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | compat/snprintf.c: clarify SNPRINTF_SIZE_CORRJunio C Hamano2009-08-221-1/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/replace'Junio C Hamano2009-08-2223-13/+610
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t6050: check pushing something based on a replaced commitChristian Couder2009-06-011-0/+68
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: add documentation for "git replace"Christian Couder2009-06-011-0/+71
| * | | | | | | | | | | | | | | | | | | | | | | Add git-replace to .gitignoreDavid Aguilar2009-06-011-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | builtin-replace: use "usage_msg_opt" to give better error messagesChristian Couder2009-06-011-6/+12
| * | | | | | | | | | | | | | | | | | | | | | | parse-options: add new function "usage_msg_opt"Christian Couder2009-06-013-1/+13
| * | | | | | | | | | | | | | | | | | | | | | | builtin-replace: teach "git replace" to actually replaceChristian Couder2009-06-012-1/+59