summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | write_name{_quoted_relative,}(): remove redundant parametersJiang Xin2013-06-263-13/+10
| * | | | | | | | | | | | | | | | | | | quote_path_relative(): remove redundant parameterJiang Xin2013-06-266-29/+24
| * | | | | | | | | | | | | | | | | | | quote.c: substitute path_relative with relative_pathJiang Xin2013-06-262-55/+9
| * | | | | | | | | | | | | | | | | | | path.c: refactor relative_path(), not only strip prefixJiang Xin2013-06-265-51/+111
| * | | | | | | | | | | | | | | | | | | test: add test cases for relative_pathJiang Xin2013-06-262-0/+62
* | | | | | | | | | | | | | | | | | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-07-225-53/+278
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | do not die when error in config parsing of buf occursHeiko Voigt2013-07-121-2/+8
| * | | | | | | | | | | | | | | | | | | | teach config --blob option to parse config from databaseHeiko Voigt2013-07-125-7/+193
| * | | | | | | | | | | | | | | | | | | | config: make parsing stack struct independent from actual data sourceHeiko Voigt2013-07-121-21/+43
| * | | | | | | | | | | | | | | | | | | | config: drop cf validity check in get_next_char()Heiko Voigt2013-07-121-16/+13
| * | | | | | | | | | | | | | | | | | | | config: factor out config file stack managementHeiko Voigt2013-07-121-14/+28
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'Junio C Hamano2013-07-221-11/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | upload-pack: remove a piece of dead codemk/upload-pack-off-by-one-dead-code-removalMatthijs Kooijman2013-07-151-11/+6
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/t0008-sigpipe-fix'Junio C Hamano2013-07-221-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | t0008: avoid SIGPIPE race condition on fifojk/t0008-sigpipe-fixJeff King2013-07-121-2/+10
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-2229-85/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-0929-85/+93
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/gcc-function-attributes'Junio C Hamano2013-07-2210-5/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add the LAST_ARG_MUST_BE_NULL macrojk/gcc-function-attributesRamsay Jones2013-07-195-5/+12
| * | | | | | | | | | | | | | | | | | | | | | | | wt-status: use "format" function attribute for status_printfJeff King2013-07-091-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | use "sentinel" function attribute for variadic listsJeff King2013-07-094-0/+5
| * | | | | | | | | | | | | | | | | | | | | | | | add missing "format" function attributesJeff King2013-07-094-1/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'db/show-ref-head'Junio C Hamano2013-07-223-6/+179
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | show-ref: make --head always show the HEAD refdb/show-ref-headDoug Bell2013-07-173-6/+179
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/blame-L-breakage'Junio C Hamano2013-07-225-115/+283
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | blame-options.txt: explain that -L <start> and <end> are optionalEric Sunshine2013-07-171-2/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | blame-options.txt: place each -L option variation on its own lineEric Sunshine2013-07-171-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | t8001/t8002 (blame): add blame -L :funcname testsEric Sunshine2013-07-171-2/+46
| * | | | | | | | | | | | | | | | | | | | | | | | | t8001/t8002 (blame): add blame -L testsEric Sunshine2013-07-171-3/+101
| * | | | | | | | | | | | | | | | | | | | | | | | | t8001/t8002 (blame): modernize styleEric Sunshine2013-07-173-112/+127
| * | | | | | | | | | | | | | | | | | | | | | | | | line-range: fix "blame -L X,-N" regressionEric Sunshine2013-07-171-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/protect-low-3-fds'Junio C Hamano2013-07-225-21/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | git: ensure 0/1/2 are open in main()tr/protect-low-3-fdsThomas Rast2013-07-171-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | daemon/shell: refactor redirection of 0/1/2 from /dev/nullThomas Rast2013-07-174-21/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/parse-object-buffer-eaten'Junio C Hamano2013-07-221-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | parse_object_buffer: correct freeing the buffersb/parse-object-buffer-eatenStefan Beller2013-07-171-4/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/do-not-call-submodules-subprojects'Junio C Hamano2013-07-223-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | show-branch: fix description of --date-ordertr/do-not-call-submodules-subprojectsThomas Rast2013-07-181-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | apply, entry: speak of submodules instead of subprojectsThomas Rast2013-07-182-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano2013-07-226-28/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-log.txt: capitalize section namesmm/diff-no-patch-synonym-to-sMatthieu Moy2013-07-171-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: move description of -s, --no-patch to diff-options.txtMatthieu Moy2013-07-172-4/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-show.txt: include common diff options, like git-log.txtMatthieu Moy2013-07-171-0/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: allow --patch & cie to override -s/--no-patchMatthieu Moy2013-07-172-11/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: allow --no-patch as synonym for -sMatthieu Moy2013-07-173-1/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t4000-diff-format.sh: modernize styleMatthieu Moy2013-07-171-9/+9
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dw/request-pull-diag'Junio C Hamano2013-07-221-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | request-pull: improve error message for invalid revision argsdw/request-pull-diagDirk Wallenstein2013-07-171-2/+12
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailmap-case-insensitivity'Junio C Hamano2013-07-222-28/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mailmap: style fixesjc/mailmap-case-insensitivityJunio C Hamano2013-07-151-15/+27