summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-05-312-2/+24
|\
| * remote: allow "-t" with fetch mirrorsJeff King2011-05-262-2/+24
* | Merge branch 'jl/read-tree-m-dry-run'Junio C Hamano2011-05-3114-143/+202
|\ \
| * | Teach read-tree the -n|--dry-run optionJens Lehmann2011-05-2512-140/+198
| * | unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann2011-05-252-3/+4
* | | Sync with maintJunio C Hamano2011-05-311-0/+18
|\ \ \
| * | | Start 1.7.5.4 draft release notesJunio C Hamano2011-05-312-1/+19
| * | | Merge branch 'tr/add-i-no-escape' into maintJunio C Hamano2011-05-311-0/+19
| |\ \ \
| * \ \ \ Merge branch 'vh/config-interactive-singlekey-doc' into maintJunio C Hamano2011-05-315-13/+21
| |\ \ \ \
| * \ \ \ \ Merge branch 'ml/test-readme' into maintJunio C Hamano2011-05-311-8/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ab/i18n-fixup' into maintJunio C Hamano2011-05-3140-383/+375
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-318-40/+152
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rr/doc-content-type' into maintJunio C Hamano2011-05-312-62/+103
| |\ \ \ \ \ \ \ \
* | | | | | | | | | config.c: Remove unused git_config_global() functionRamsay Jones2011-05-311-5/+0
* | | | | | | | | | Merge branch 'jc/fmt-req-fix'Junio C Hamano2011-05-301-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | userformat_find_requirements(): find requirement for the correct formatJunio C Hamano2011-05-251-1/+1
* | | | | | | | | | | Merge branch 'jk/maint-config-alias-fix'Junio C Hamano2011-05-304-45/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | handle_options(): do not miscount how many arguments were usedJunio C Hamano2011-05-242-5/+3
| * | | | | | | | | | | config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King2011-05-242-40/+18
| * | | | | | | | | | | git_config: don't peek at global config_parametersJeff King2011-05-241-4/+11
| * | | | | | | | | | | config: make environment parsing routines staticJeff King2011-05-242-4/+2
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-306-8/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano2011-05-304-5/+11
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | read_gitfile_gently: use ssize_t to hold read resultJeff King2011-05-261-1/+1
| | * | | | | | | | | | | remove tests of always-false conditionJim Meyering2011-05-262-2/+2
| | * | | | | | | | | | | rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering2011-05-261-2/+8
| * | | | | | | | | | | | Merge branch 'bc/maint-submodule-fix-parked' into maintJunio C Hamano2011-05-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | git-submodule.sh: separate parens by a space to avoid confusing some shellsBrandon Casey2011-05-261-1/+1
| * | | | | | | | | | | | | Merge branch 'bc/maint-api-doc-parked' into maintJunio C Hamano2011-05-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Documentation/technical/api-diff.txt: correct name of diff_unmerge()Brandon Casey2011-05-261-2/+2
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano2011-05-293-6/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-3011-30/+347
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-grep: Fix problems with recently added testsMichał Kiedrowicz2011-05-291-32/+26
| * | | | | | | | | | | | | | | git-grep: Update tests (mainly for -P)Michał Kiedrowicz2011-05-231-0/+85
| * | | | | | | | | | | | | | | Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONSJunio C Hamano2011-05-161-0/+1
| * | | | | | | | | | | | | | | git-grep: update tests now regexp type is "last one wins"Junio C Hamano2011-05-161-16/+0
| * | | | | | | | | | | | | | | git-grep: do not die upon -F/-P when grep.extendedRegexp is set.Junio C Hamano2011-05-091-13/+43
| * | | | | | | | | | | | | | | git-grep: Bail out when -P is used with -F or -EMichał Kiedrowicz2011-05-092-1/+19
| * | | | | | | | | | | | | | | grep: Add basic testsMichał Kiedrowicz2011-05-093-0/+44
| * | | | | | | | | | | | | | | configure: Check for libpcreMichał Kiedrowicz2011-05-092-0/+41
| * | | | | | | | | | | | | | | git-grep: Learn PCREMichał Kiedrowicz2011-05-096-1/+107
| * | | | | | | | | | | | | | | grep: Extract compile_regexp_failed() from compile_regexp()Michał Kiedrowicz2011-05-091-9/+16
| * | | | | | | | | | | | | | | grep: Fix a typo in a commentMichał Kiedrowicz2011-05-091-1/+1
| * | | | | | | | | | | | | | | grep: Put calls to fixmatch() and regmatch() into patmatch()Michał Kiedrowicz2011-05-051-8/+15
| * | | | | | | | | | | | | | | contrib/completion: --line-number to git grepMichał Kiedrowicz2011-05-051-1/+1
| * | | | | | | | | | | | | | | Documentation: Add --line-number to git-grep synopsisMichał Kiedrowicz2011-05-051-1/+1
* | | | | | | | | | | | | | | | Merge branch 'jc/notes-batch-removal'Junio C Hamano2011-05-298-28/+151
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | show: --ignore-missingJunio C Hamano2011-05-195-3/+21
| * | | | | | | | | | | | | | | | notes remove: --stdin reads from the standard inputJunio C Hamano2011-05-193-5/+56
| * | | | | | | | | | | | | | | | notes remove: --ignore-missingJunio C Hamano2011-05-193-5/+35
View Lorry Controller Status