Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'ab/i18n-envsubst-doc-fix' | Junio C Hamano | 2011-05-31 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | git-sh-i18n--envsubst: add SYNOPSIS section to the documentation | Ævar Arnfjörð Bjarmason | 2011-05-30 | 1 | -0/+10 | |
* | | | | | | | | | | | | | Merge branch 'jc/log-quiet-fix' | Junio C Hamano | 2011-05-31 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | log: --quiet should serve as synonym to -s | Junio C Hamano | 2011-05-28 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | Merge branch 'kk/maint-prefix-in-config-mak' | Junio C Hamano | 2011-05-31 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | config.mak.in: allow "configure --sysconfdir=/else/where" | Junio C Hamano | 2011-05-27 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | Merge branch 'jk/rebase-head-reflog' | Junio C Hamano | 2011-05-31 | 3 | -4/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | rebase: write a reflog entry when finishing | Jeff King | 2011-05-27 | 3 | -3/+7 | |
| * | | | | | | | | | | | | | | rebase: create HEAD reflog entry when aborting | Csaba Henk | 2011-05-27 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/maint-docs' | Junio C Hamano | 2011-05-31 | 4 | -15/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | docs: fix some antique example output | Jeff King | 2011-05-26 | 2 | -4/+4 | |
| * | | | | | | | | | | | | | docs: make sure literal "->" isn't converted to arrow | Jeff King | 2011-05-26 | 2 | -5/+5 | |
| * | | | | | | | | | | | | | docs: update status --porcelain format | Jeff King | 2011-05-26 | 1 | -4/+23 | |
| * | | | | | | | | | | | | | docs: minor grammar fixes to git-status | Jeff King | 2011-05-26 | 1 | -3/+4 | |
* | | | | | | | | | | | | | | Merge branch 'jk/read-in-full-stops-on-error' | Junio C Hamano | 2011-05-31 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | read_in_full: always report errors | Jeff King | 2011-05-26 | 1 | -2/+4 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer' | Junio C Hamano | 2011-05-31 | 2 | -2/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | remote: allow "-t" with fetch mirrors | Jeff King | 2011-05-26 | 2 | -2/+24 | |
* | | | | | | | | | | | | | | | | Merge branch 'jl/read-tree-m-dry-run' | Junio C Hamano | 2011-05-31 | 14 | -143/+202 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Teach read-tree the -n|--dry-run option | Jens Lehmann | 2011-05-25 | 12 | -140/+198 | |
| * | | | | | | | | | | | | | | | | unpack-trees: add the dry_run flag to unpack_trees_options | Jens Lehmann | 2011-05-25 | 2 | -3/+4 | |
* | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2011-05-31 | 1 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Start 1.7.5.4 draft release notes | Junio C Hamano | 2011-05-31 | 2 | -1/+19 | |
| * | | | | | | | | | | | | | | | | Merge branch 'tr/add-i-no-escape' into maint | Junio C Hamano | 2011-05-31 | 1 | -0/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vh/config-interactive-singlekey-doc' into maint | Junio C Hamano | 2011-05-31 | 5 | -13/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ml/test-readme' into maint | Junio C Hamano | 2011-05-31 | 1 | -8/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/i18n-fixup' into maint | Junio C Hamano | 2011-05-31 | 40 | -383/+375 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/rename-degrade-cc-to-c' into maint | Junio C Hamano | 2011-05-31 | 8 | -40/+152 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rr/doc-content-type' into maint | Junio C Hamano | 2011-05-31 | 2 | -62/+103 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | config.c: Remove unused git_config_global() function | Ramsay Jones | 2011-05-31 | 1 | -5/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fmt-req-fix' | Junio C Hamano | 2011-05-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | userformat_find_requirements(): find requirement for the correct format | Junio C Hamano | 2011-05-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-config-alias-fix' | Junio C Hamano | 2011-05-30 | 4 | -45/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | handle_options(): do not miscount how many arguments were used | Junio C Hamano | 2011-05-24 | 2 | -5/+3 | |
| * | | | | | | | | | | | | | | | | | | | | config: always parse GIT_CONFIG_PARAMETERS during git_config | Jeff King | 2011-05-24 | 2 | -40/+18 | |
| * | | | | | | | | | | | | | | | | | | | | git_config: don't peek at global config_parameters | Jeff King | 2011-05-24 | 1 | -4/+11 | |
| * | | | | | | | | | | | | | | | | | | | | config: make environment parsing routines static | Jeff King | 2011-05-24 | 2 | -4/+2 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-30 | 6 | -8/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/maint-misc-fix' into maint | Junio C Hamano | 2011-05-30 | 4 | -5/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | read_gitfile_gently: use ssize_t to hold read result | Jeff King | 2011-05-26 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | remove tests of always-false condition | Jim Meyering | 2011-05-26 | 2 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' | Jim Meyering | 2011-05-26 | 1 | -2/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/maint-submodule-fix-parked' into maint | Junio C Hamano | 2011-05-30 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: separate parens by a space to avoid confusing some shells | Brandon Casey | 2011-05-26 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/maint-api-doc-parked' into maint | Junio C Hamano | 2011-05-30 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Documentation/technical/api-diff.txt: correct name of diff_unmerge() | Brandon Casey | 2011-05-26 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/run-command-error-failure' into maint | Junio C Hamano | 2011-05-29 | 3 | -6/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/grep-pcre' | Junio C Hamano | 2011-05-30 | 11 | -30/+347 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | git-grep: Fix problems with recently added tests | Michał Kiedrowicz | 2011-05-29 | 1 | -32/+26 | |
| * | | | | | | | | | | | | | | | | | | | | | | git-grep: Update tests (mainly for -P) | Michał Kiedrowicz | 2011-05-23 | 1 | -0/+85 |