summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mailinfo: with -b, keep space after [foo]tr/maint-mailinfoThomas Rast2012-01-162-2/+11
* am: learn passing -b to mailinfoThomas Rast2012-01-163-6/+31
* mailinfo documentation: accurately describe non -k caseThomas Rast2012-01-111-7/+18
* Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-3113-92/+174
|\
| * format-patch: preserve subject newlines with -kJeff King2011-05-266-3/+8
| * clean up calling conventions for pretty.c functionsJeff King2011-05-267-76/+75
| * pretty: add pp_commit_easy function for simple callersJeff King2011-05-267-12/+14
| * mailinfo: always clean up rfc822 header foldingJeff King2011-05-262-2/+2
| * t: test subject handling in format-patch / am pipelineJeff King2011-05-261-0/+77
* | Merge branch 'jn/doc-remote-helpers'Junio C Hamano2011-05-311-3/+3
|\ \
| * | Documentation: do not misinterpret refspecs as bold textJonathan Nieder2011-05-301-3/+3
* | | Merge branch 'jk/format-patch-empty-prefix'Junio C Hamano2011-05-312-1/+20
|\ \ \
| * | | format-patch: make zero-length subject prefixes prettierJeff King2011-05-302-1/+20
* | | | Merge branch 'ab/i18n-envsubst-doc-fix'Junio C Hamano2011-05-311-0/+10
|\ \ \ \
| * | | | git-sh-i18n--envsubst: add SYNOPSIS section to the documentationÆvar Arnfjörð Bjarmason2011-05-301-0/+10
* | | | | Merge branch 'jc/log-quiet-fix'Junio C Hamano2011-05-311-0/+2
|\ \ \ \ \
| * | | | | log: --quiet should serve as synonym to -sJunio C Hamano2011-05-281-0/+2
* | | | | | Merge branch 'kk/maint-prefix-in-config-mak'Junio C Hamano2011-05-311-0/+1
|\ \ \ \ \ \
| * | | | | | config.mak.in: allow "configure --sysconfdir=/else/where"Junio C Hamano2011-05-271-0/+1
* | | | | | | Merge branch 'jk/rebase-head-reflog'Junio C Hamano2011-05-313-4/+8
|\ \ \ \ \ \ \
| * | | | | | | rebase: write a reflog entry when finishingJeff King2011-05-273-3/+7
| * | | | | | | rebase: create HEAD reflog entry when abortingCsaba Henk2011-05-271-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/maint-docs'Junio C Hamano2011-05-314-15/+35
|\ \ \ \ \ \ \
| * | | | | | | docs: fix some antique example outputJeff King2011-05-262-4/+4
| * | | | | | | docs: make sure literal "->" isn't converted to arrowJeff King2011-05-262-5/+5
| * | | | | | | docs: update status --porcelain formatJeff King2011-05-261-4/+23
| * | | | | | | docs: minor grammar fixes to git-statusJeff King2011-05-261-3/+4
* | | | | | | | Merge branch 'jk/read-in-full-stops-on-error'Junio C Hamano2011-05-311-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | read_in_full: always report errorsJeff King2011-05-261-2/+4
* | | | | | | | | 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
View Lorry Controller Status