summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix parsing of @{-1}@{u} combinationJeff King2010-01-282-4/+24
* test combinations of @{} syntaxJeff King2010-01-281-0/+51
* rerere: fix too-short initializationJeff King2010-01-281-1/+1
* t0101: use absolute dateJeff King2010-01-281-1/+1
* Merge branch 'fk/threaded-grep'Junio C Hamano2010-01-283-51/+482
|\
| * Threaded grepFredrik Kuivinen2010-01-263-49/+468
| * grep: expose "status-only" feature via -qJunio C Hamano2010-01-251-2/+14
* | Merge branch 'gp/maint-cvsserver'Junio C Hamano2010-01-281-1/+1
|\ \
| * | git-cvsserver: allow regex metacharacters in CVSROOTGerrit Pape2010-01-261-1/+1
* | | tests: update tests that used to failJunio C Hamano2010-01-282-2/+2
* | | Merge branch 'jc/upstream-reflog'Junio C Hamano2010-01-272-4/+43
|\ \ \
| * | | Fix log -g this@{upstream}Junio C Hamano2010-01-262-4/+43
* | | | Merge branch 'jc/maint-reflog-bad-timestamp'Junio C Hamano2010-01-274-10/+86
|\ \ \ \
| * | | | t0101: use a fixed timestamp when searching in the reflogJunio C Hamano2010-01-271-2/+2
| * | | | Update @{bogus.timestamp} fix not to die()Junio C Hamano2010-01-271-2/+2
| * | | | approxidate_careful() reports errorneous date stringJunio C Hamano2010-01-264-10/+86
| | |/ / | |/| |
* | | | Merge branch 'il/maint-colon-address'Junio C Hamano2010-01-272-6/+38
|\ \ \ \
| * | | | Allow use of []-wrapped addresses in git://Ilari Liusvaara2010-01-261-2/+8
| * | | | Support addresses with ':' in git-daemonIlari Liusvaara2010-01-261-4/+30
| |/ / /
* | | | Merge branch 'il/maint-xmallocz'Junio C Hamano2010-01-274-10/+15
|\ \ \ \
| * | | | Fix integer overflow in unpack_compressed_entry()Ilari Liusvaara2010-01-261-2/+1
| * | | | Fix integer overflow in unpack_sha1_rest()Ilari Liusvaara2010-01-261-2/+1
| * | | | Fix integer overflow in patch_delta()Ilari Liusvaara2010-01-261-2/+1
| * | | | Add xmallocz()Ilari Liusvaara2010-01-262-4/+12
| |/ / /
* | | | Merge branch 'jh/maint-config-file-prefix'Junio C Hamano2010-01-272-1/+12
|\ \ \ \
| * | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dirJohan Herland2010-01-262-1/+12
* | | | | transport_get(): drop unnecessary check for !remoteJunio C Hamano2010-01-271-1/+1
* | | | | Fix remote.<remote>.vcsIlari Liusvaara2010-01-271-6/+5
* | | | | Merge branch 'jl/diff-submodule-ignore'Junio C Hamano2010-01-267-8/+85
|\ \ \ \ \
| * | | | | Teach diff --submodule that modified submodule directory is dirtyJens Lehmann2010-01-244-1/+72
| * | | | | git diff: Don't test submodule dirtiness with --ignore-submodulesJens Lehmann2010-01-241-4/+6
| * | | | | Make ce_uptodate() trustworthy againJunio C Hamano2010-01-243-3/+7
* | | | | | work around an obnoxious bash "safety feature" on OpenBSDJunio C Hamano2010-01-261-3/+3
* | | | | | fix portability issues with $ in double quotesStephen Boyd2010-01-2612-52/+52
* | | | | | grep: use REG_STARTEND (if available) to speed up regexecBenjamin Kramer2010-01-261-1/+8
| |_|_|/ / |/| | | |
* | | | | am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd2010-01-252-1/+17
* | | | | t0022: replace non-portable literal CRStephen Boyd2010-01-251-1/+1
* | | | | tests: consolidate CR removal/addition functionsStephen Boyd2010-01-256-58/+37
| |_|_|/ |/| | |
* | | | commit-tree: remove unused #defineStephen Boyd2010-01-251-2/+0
* | | | t5541-http-push: make grep expression check for one line onlyTay Ray Chuan2010-01-251-8/+4
* | | | rebase: replace antiquated sed invocationStephen Boyd2010-01-251-4/+2
* | | | Add test-run-command to .gitignoreAlejandro Riveira Fernández2010-01-251-0/+1
* | | | git_connect: use use_shell instead of explicit "sh", "-c"Johannes Sixt2010-01-251-2/+1
* | | | gitweb.js: Workaround for IE8 bugv1.7.0-rc0Jakub Narebski2010-01-241-1/+6
* | | | Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-2419-140/+734
|\ \ \ \
| * | | | read-tree --debug-unpackJunio C Hamano2010-01-073-0/+72
| * | | | unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-075-7/+140
| * | | | unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-074-65/+173
| * | | | Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-032-6/+9
| * | | | traverse_trees(): handle D/F conflict case sanelyJunio C Hamano2010-01-033-46/+237