summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Sync with 1.6.1.1Junio C Hamano2009-01-263-9/+20
|\
| * GIT 1.6.1.1v1.6.1.1Junio C Hamano2009-01-252-8/+18
* | Ignore test-ctypeBenjamin Kramer2009-01-251-0/+1
* | http-push.c: style fixesJunio C Hamano2009-01-251-4/+5
* | Merge branch 'js/patience-diff'Junio C Hamano2009-01-2410-2/+564
|\ \
| * | bash completions: Add the --patience optionJohannes Schindelin2009-01-071-0/+2
| * | Introduce the diff option '--patience'Johannes Schindelin2009-01-074-1/+174
| * | Implement the patience diff algorithmJohannes Schindelin2009-01-075-1/+389
* | | Merge branch 'maint'Junio C Hamano2009-01-241-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano2009-01-242-18/+67
| |\ \
| * \ \ Merge branch 'tr/maint-no-index-fixes' into maintJunio C Hamano2009-01-243-10/+20
| |\ \ \
| * \ \ \ Merge branch 'rs/maint-shortlog-foldline' into maintJunio C Hamano2009-01-242-5/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'pj/maint-ldflags' into maintJunio C Hamano2009-01-241-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'pb/maint-git-pm-false-dir' into maintJunio C Hamano2009-01-241-3/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/maint-bisect-gitk' into maintJunio C Hamano2009-01-241-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'js/add-not-submodule' into maintJunio C Hamano2009-01-242-0/+53
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-format-patch' into maintJunio C Hamano2009-01-241-0/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'am/maint-push-doc' into maintJunio C Hamano2009-01-241-7/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix Documentation for git-describeBoyd Stephen Smith Jr2009-01-231-1/+1
* | | | | | | | | | | | | http-push: refactor lock-related headers creation for curl requestsRay Chuan2009-01-241-29/+39
* | | | | | | | | | | | | git-am: implement --reject option passed to git-applymartin f. krafft2009-01-244-1/+36
* | | | | | | | | | | | | t/t4202-log.sh: Add testcasesArjen Laarhoven2009-01-241-9/+50
* | | | | | | | | | | | | Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano2009-01-222-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix combined use of whitespace ignore options to diffKeith Cascio2009-01-202-6/+8
* | | | | | | | | | | | | | Merge branch 'lt/maint-wrap-zlib'Junio C Hamano2009-01-229-34/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Wrap inflate and other zlib routines for better error reportingLinus Torvalds2009-01-119-34/+99
* | | | | | | | | | | | | | | Merge branch 'am/maint-push-doc'Junio C Hamano2009-01-221-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Documentation: avoid using undefined parametersAnders Melchiorsen2009-01-181-2/+2
| * | | | | | | | | | | | | | Documentation: mention branches rather than headsAnders Melchiorsen2009-01-181-2/+2
| * | | | | | | | | | | | | | Documentation: remove a redundant elaborationAnders Melchiorsen2009-01-181-2/+1
| * | | | | | | | | | | | | | Documentation: git push repository can also be a remoteAnders Melchiorsen2009-01-181-1/+3
* | | | | | | | | | | | | | | Merge branch 'sg/maint-gitdir-in-subdir'Junio C Hamano2009-01-222-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix gitdir detection when in subdir of gitdirSZEDER Gábor2009-01-182-1/+12
* | | | | | | | | | | | | | | | Merge branch 'jf/am-failure-report'Junio C Hamano2009-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-am: re-fix the diag message printingJunio C Hamano2009-01-191-1/+1
| * | | | | | | | | | | | | | | | git-am: Make it easier to see which patch failedJonas Flodén2009-01-181-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'rs/ctype'Junio C Hamano2009-01-227-29/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add is_regex_special()René Scharfe2009-01-184-11/+13
| * | | | | | | | | | | | | | | | | Change NUL char handling of isspecial()René Scharfe2009-01-185-8/+15
| * | | | | | | | | | | | | | | | | Reformat ctype.cRené Scharfe2009-01-181-18/+14
| * | | | | | | | | | | | | | | | | Add ctype testRené Scharfe2009-01-183-1/+92
* | | | | | | | | | | | | | | | | | Merge branch 'sb/hook-cleanup'Junio C Hamano2009-01-228-112/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | run_hook(): allow more than 9 hook argumentsStephan Beyer2009-01-182-10/+10
| * | | | | | | | | | | | | | | | | | run_hook(): check the executability of the hook before filling argvStephan Beyer2009-01-181-3/+3
| * | | | | | | | | | | | | | | | | | api-run-command.txt: talk about run_hook()Stephan Beyer2009-01-181-0/+15
| * | | | | | | | | | | | | | | | | | Move run_hook() from builtin-commit.c into run-command.c (libgit)Stephan Beyer2009-01-187-113/+57
| * | | | | | | | | | | | | | | | | | checkout: don't crash on file checkout before running post-checkout hookStephan Beyer2009-01-181-2/+4
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/color-parse'Junio C Hamano2009-01-225-12/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Optimize color_parse_memRené Scharfe2009-01-201-17/+21