summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | 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
| * | | | | | | | | | | | mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specificationEric Sunshine2013-07-151-6/+9
| * | | | | | | | | | | | mailmap: debug: eliminate -Wformat field precision type warningEric Sunshine2013-07-151-3/+3
| * | | | | | | | | | | | mailmap: debug: fix malformed fprintf() format conversion specificationEric Sunshine2013-07-151-1/+1
| * | | | | | | | | | | | mailmap: debug: fix out-of-order fprintf() argumentsEric Sunshine2013-07-151-1/+1
| * | | | | | | | | | | | mailmap: do not downcase mailmap entriesJunio C Hamano2013-07-152-13/+9
| * | | | | | | | | | | | t4203: demonstrate loss of uppercase characters in canonical emailEric Sunshine2013-07-151-0/+9
| * | | | | | | | | | | | mailmap: do not lose single-letter namesJunio C Hamano2013-07-152-2/+2
| * | | | | | | | | | | | t4203: demonstrate loss of single-character name in mailmap entryEric Sunshine2013-07-151-0/+9
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tr/fd-gotcha-fixes'Junio C Hamano2013-07-222-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | run-command: dup_devnull(): guard against syscalls failingThomas Rast2013-07-121-1/+4
| * | | | | | | | | | | | git_mkstemps: correctly test return value of open()Dale R. Worley2013-07-121-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mm/color-auto-default'Junio C Hamano2013-07-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git add -e: Explicitly specify that patch should have no colormm/color-auto-defaultAndrew Wong2013-07-191-0/+1
* | | | | | | | | | | | | Merge branch 'jc/simple-add-must-be-a-no-op'Junio C Hamano2013-07-221-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t2202: make sure "git add" (no args) stays a no-opjc/simple-add-must-be-a-no-opJunio C Hamano2013-07-191-0/+10
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2013-07-212-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update draft release notes to 1.8.3.4Junio C Hamano2013-07-211-0/+5
| * | | | | | | | | | | | | | Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maintJunio C Hamano2013-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/maint-t5150-dirname' into maintJunio C Hamano2013-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/version-gen-gitdir' into maintJunio C Hamano2013-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nk/config-local-doc' into maintJunio C Hamano2013-07-211-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kb/diff-blob-blob-doc' into maintJunio C Hamano2013-07-211-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/merge-in-dirty-worktree-doc' into maintJunio C Hamano2013-07-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maintJunio C Hamano2013-07-219-21/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ft/doc-git-transport' into maintJunio C Hamano2013-07-211-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/maint-lockfile-overflow' into maintJunio C Hamano2013-07-211-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-diff-core-safecrlf' into maintJunio C Hamano2013-07-212-1/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t9801: git-p4: check ignore files with client specVitor Antunes2013-07-211-3/+20
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2013-07-194-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Start preparing for 1.8.3.4Junio C Hamano2013-07-192-1/+16
| * | | | | | | | | | | | | | | | | | | | | | | apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | http-push.c::add_send_request(): do not initialize transfer_requestStefan Beller2013-07-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maintJunio C Hamano2013-07-192-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/name-rev-stdin-doc' into maintJunio C Hamano2013-07-191-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ft/diff-rename-default-score-is-half' into maintJunio C Hamano2013-07-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t1512-fix' into maintJunio C Hamano2013-07-192-11/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vl/typofix' into maintJunio C Hamano2013-07-193-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'wk/doc-git-has-grown' into maintJunio C Hamano2013-07-191-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \