aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/format-patch-empty-prefix'Junio C Hamano2011-05-31
|\
| * format-patch: make zero-length subject prefixes prettierJeff King2011-05-30
* | Merge branch 'ab/i18n-envsubst-doc-fix'Junio C Hamano2011-05-31
|\ \
| * | git-sh-i18n--envsubst: add SYNOPSIS section to the documentationÆvar Arnfjörð Bjarmason2011-05-30
* | | Merge branch 'jc/log-quiet-fix'Junio C Hamano2011-05-31
|\ \ \
| * | | log: --quiet should serve as synonym to -sJunio C Hamano2011-05-28
* | | | Merge branch 'kk/maint-prefix-in-config-mak'Junio C Hamano2011-05-31
|\ \ \ \
| * | | | config.mak.in: allow "configure --sysconfdir=/else/where"Junio C Hamano2011-05-27
* | | | | Merge branch 'jk/rebase-head-reflog'Junio C Hamano2011-05-31
|\ \ \ \ \
| * | | | | rebase: write a reflog entry when finishingJeff King2011-05-27
| * | | | | rebase: create HEAD reflog entry when abortingCsaba Henk2011-05-27
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/maint-docs'Junio C Hamano2011-05-31
|\ \ \ \ \
| * | | | | docs: fix some antique example outputJeff King2011-05-26
| * | | | | docs: make sure literal "->" isn't converted to arrowJeff King2011-05-26
| * | | | | docs: update status --porcelain formatJeff King2011-05-26
| * | | | | docs: minor grammar fixes to git-statusJeff King2011-05-26
* | | | | | Merge branch 'jk/read-in-full-stops-on-error'Junio C Hamano2011-05-31
|\ \ \ \ \ \
| * | | | | | read_in_full: always report errorsJeff King2011-05-26
* | | | | | | Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-05-31
|\ \ \ \ \ \ \
| * | | | | | | remote: allow "-t" with fetch mirrorsJeff King2011-05-26
* | | | | | | | Merge branch 'jl/read-tree-m-dry-run'Junio C Hamano2011-05-31
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach read-tree the -n|--dry-run optionJens Lehmann2011-05-25
| * | | | | | | | unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann2011-05-25
* | | | | | | | | Sync with maintJunio C Hamano2011-05-31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Start 1.7.5.4 draft release notesJunio C Hamano2011-05-31
| * | | | | | | | | Merge branch 'tr/add-i-no-escape' into maintJunio C Hamano2011-05-31
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'vh/config-interactive-singlekey-doc' into maintJunio C Hamano2011-05-31
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ml/test-readme' into maintJunio C Hamano2011-05-31
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/i18n-fixup' into maintJunio C Hamano2011-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/doc-content-type' into maintJunio C Hamano2011-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | config.c: Remove unused git_config_global() functionRamsay Jones2011-05-31
* | | | | | | | | | | | | | | | Merge branch 'jc/fmt-req-fix'Junio C Hamano2011-05-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | userformat_find_requirements(): find requirement for the correct formatJunio C Hamano2011-05-25
* | | | | | | | | | | | | | | | | Merge branch 'jk/maint-config-alias-fix'Junio C Hamano2011-05-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | handle_options(): do not miscount how many arguments were usedJunio C Hamano2011-05-24
| * | | | | | | | | | | | | | | | config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King2011-05-24
| * | | | | | | | | | | | | | | | git_config: don't peek at global config_parametersJeff King2011-05-24
| * | | | | | | | | | | | | | | | config: make environment parsing routines staticJeff King2011-05-24
* | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano2011-05-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | read_gitfile_gently: use ssize_t to hold read resultJeff King2011-05-26
| | * | | | | | | | | | | | | | | | remove tests of always-false conditionJim Meyering2011-05-26
| | * | | | | | | | | | | | | | | | rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering2011-05-26
| * | | | | | | | | | | | | | | | | Merge branch 'bc/maint-submodule-fix-parked' into maintJunio C Hamano2011-05-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | git-submodule.sh: separate parens by a space to avoid confusing some shellsBrandon Casey2011-05-26
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'bc/maint-api-doc-parked' into maintJunio C Hamano2011-05-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Documentation/technical/api-diff.txt: correct name of diff_unmerge()Brandon Casey2011-05-26
| | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano2011-05-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \