summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2011-02-1515-63/+49
|\
| * pull: do not display fetch usage on --help-allMichael J Gruber2011-02-151-1/+1
| * git-tag.txt: list all modes in the descriptionMichael J Gruber2011-02-151-5/+6
| * commit,status: describe -u likewiseMichael J Gruber2011-02-151-1/+1
| * add: describe --patch like checkout, resetMichael J Gruber2011-02-151-1/+1
| * commit,merge,tag: describe -m likewiseMichael J Gruber2011-02-153-5/+5
| * clone,init: describe --template using the same wordingMichael J Gruber2011-02-152-3/+3
| * commit,status: describe --porcelain just like pushMichael J Gruber2011-02-151-2/+2
| * commit,tag: use same wording for -FMichael J Gruber2011-02-152-2/+2
| * configure: use AC_LANG_PROGRAM consistentlyRalf Wildenhues2011-02-142-39/+21
| * string_list_append: always set util pointer to NULLJeff King2011-02-141-0/+1
| * correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-144-4/+6
* | Revert "unpack_trees(): skip trees that are the same in all input"Junio C Hamano2011-02-151-56/+0
* | Obey p4 views when using client specIan Wienand2011-02-142-4/+51
* | gitignore: add test-mktemp to ignore listÆvar Arnfjörð Bjarmason2011-02-131-0/+1
* | repo-config: add deprecation warningRené Scharfe2011-02-133-2/+9
* | Merge branch 'maint'Junio C Hamano2011-02-114-2/+33
|\ \ | |/
| * Git 1.7.4.1v1.7.4.1Junio C Hamano2011-02-114-3/+31
| * Merge branch 'jc/fsck-fixes' into maintJunio C Hamano2011-02-111-9/+22
| |\
| * | clone: fixup recurse_submodules optionChris Packham2011-02-111-1/+1
| * | svn-fe: warn about experimental statusJonathan Nieder2011-02-111-0/+3
* | | Merge branch 'maint'Junio C Hamano2011-02-104-4/+11
|\ \ \ | |/ /
| * | compat: helper for detecting unsigned overflowJonathan Nieder2011-02-104-4/+11
* | | Merge branch 'tr/merge-unborn-clobber'Junio C Hamano2011-02-091-0/+16
|\ \ \
| * | | Exhibit merge bug that clobbers index&WTThomas Rast2010-08-251-0/+16
* | | | Merge branch 'jc/unpack-trees'Junio C Hamano2011-02-091-2/+62
|\ \ \ \
| * | | | unpack_trees(): skip trees that are the same in all inputJunio C Hamano2011-01-041-0/+56
| * | | | unpack-trees.c: cosmetic fixJunio C Hamano2010-12-221-4/+8
* | | | | Merge branch 'jc/fsck-fixes'Junio C Hamano2011-02-091-9/+22
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | fsck: do not give up too early in fsck_dir()Junio C Hamano2011-01-271-6/+12
| * | | | fsck: drop unused parameter from traverse_one_object()Junio C Hamano2011-01-271-3/+10
* | | | | Merge branch 'tr/diff-words-test'Junio C Hamano2011-02-0941-255/+933
|\ \ \ \ \
| * | | | | t4034 (diff --word-diff): add a minimum Perl drier test vectorJunio C Hamano2011-01-184-0/+58
| * | | | | t4034 (diff --word-diff): style suggestionsJonathan Nieder2011-01-181-245/+205
| * | | | | userdiff: simplify word-diff safeguardJonathan Nieder2011-01-181-24/+16
| * | | | | t4034: bulk verify builtin word regex sanityThomas Rast2011-01-1837-0/+668
* | | | | | Merge branch 'rr/fi-import-marks-if-exists'Junio C Hamano2011-02-093-3/+72
|\ \ \ \ \ \
| * | | | | | fast-import: Introduce --import-marks-if-existsRamkumar Ramachandra2011-01-183-3/+72
| |/ / / / /
* | | | | | Merge branch 'jn/unpack-lstat-failure-report'Junio C Hamano2011-02-091-6/+12
|\ \ \ \ \ \
| * | | | | | unpack-trees: handle lstat failure for existing fileJonathan Nieder2011-01-131-1/+3
| * | | | | | unpack-trees: handle lstat failure for existing directoryJonathan Nieder2011-01-131-5/+9
* | | | | | | Merge branch 'ef/alias-via-run-command'Junio C Hamano2011-02-091-17/+17
|\ \ \ \ \ \ \
| * | | | | | | alias: use run_command api to execute aliasesErik Faye-Lund2011-01-061-17/+17
* | | | | | | | Merge branch 'cb/setup'Junio C Hamano2011-02-091-4/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | setup: translate symlinks in filename when using absolute pathsCarlo Marcelo Arenas Belon2011-01-041-4/+7
* | | | | | | | | Merge branch 'ae/better-template-failure-report'Junio C Hamano2011-02-094-4/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve error messages when temporary file creation failsArnout Engelen2010-12-214-4/+56
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jn/cherry-pick-strategy-option'Junio C Hamano2011-02-097-11/+97
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-287-11/+97
* | | | | | | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2011-02-093-0/+10
|\ \ \ \ \ \ \ \ \