summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wildmatch: remove unused wildopts parameterab/wildmatchÆvar Arnfjörð Bjarmason2017-06-2316-29/+22
* Tenth batch for 2.14Junio C Hamano2017-06-221-0/+28
* Merge branch 'rs/strbuf-addftime-zZ'Junio C Hamano2017-06-225-11/+73
|\
| * date: use localtime() for "-local" time formatsrs/strbuf-addftime-zZJeff King2017-06-152-2/+13
| * t0006: check --date=format zone offsetsJeff King2017-06-151-2/+7
| * strbuf: let strbuf_addftime handle %z and %Z itselfRené Scharfe2017-06-155-8/+54
* | Merge branch 'sd/t3200-branch-m-test'Junio C Hamano2017-06-221-0/+17
|\ \
| * | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-testSahil Dua2017-06-131-0/+17
* | | Merge branch 'ps/stash-push-pathspec-fix'Junio C Hamano2017-06-222-0/+19
|\ \ \
| * | | git-stash: fix pushing stash with pathspec from subdirps/stash-push-pathspec-fixPatrick Steinhardt2017-06-132-0/+19
* | | | Merge branch 'ls/github'Junio C Hamano2017-06-222-0/+26
|\ \ \ \
| * | | | Configure Git contribution guidelines for github.comls/githubLars Schneider2017-06-132-0/+26
| | |/ / | |/| |
* | | | Merge branch 'sg/revision-parser-skip-prefix'Junio C Hamano2017-06-222-48/+44
|\ \ \ \
| * | | | revision.c: use skip_prefix() in handle_revision_pseudo_opt()sg/revision-parser-skip-prefixSZEDER Gábor2017-06-121-9/+9
| * | | | revision.c: use skip_prefix() in handle_revision_opt()SZEDER Gábor2017-06-121-25/+23
| * | | | revision.c: stricter parsing of '--early-output'SZEDER Gábor2017-06-121-10/+7
| * | | | revision.c: stricter parsing of '--no-{min,max}-parents'SZEDER Gábor2017-06-121-2/+2
| * | | | revision.h: turn rev_info.early_output back into an unsigned intSZEDER Gábor2017-06-121-2/+3
* | | | | Merge branch 'mh/fast-import-raise-default-depth'Junio C Hamano2017-06-222-2/+2
|\ \ \ \ \
| * | | | | fast-import: increase the default pack depth to 50mh/fast-import-raise-default-depthMike Hommey2017-06-122-2/+2
* | | | | | Merge branch 'km/test-mailinfo-b-failure'Junio C Hamano2017-06-221-0/+42
|\ \ \ \ \ \
| * | | | | | t5100: add some more mailinfo testskm/test-mailinfo-b-failureKyle J. McKay2017-06-121-0/+42
* | | | | | | Merge branch 'ah/filter-branch-setup'Junio C Hamano2017-06-222-11/+26
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: add [--] to usageah/filter-branch-setupAndreas Heiduk2017-06-121-1/+1
| * | | | | | | filter-branch: add `--setup` stepAndreas Heiduk2017-06-122-10/+25
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'pc/dir-count-slashes'Junio C Hamano2017-06-224-21/+15
|\ \ \ \ \ \ \
| * | | | | | | dir: create function count_slashes()pc/dir-count-slashesPrathamesh Chavan2017-06-124-21/+15
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sb/t4005-modernize'Junio C Hamano2017-06-221-52/+43
|\ \ \ \ \ \ \
| * | | | | | | t4005: modernize style and drop hard coded sha1sb/t4005-modernizeStefan Beller2017-06-101-52/+43
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-222-3/+4
|\ \ \ \ \ \ \
| * | | | | | | configure.ac: loosen FREAD_READS_DIRECTORIES test programnd/fopen-errorsJeff King2017-06-152-3/+4
* | | | | | | | Ninth batch for 2.14Junio C Hamano2017-06-191-0/+29
* | | | | | | | Merge branch 'jk/consistent-h'Junio C Hamano2017-06-1912-13/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | t0012: test "-h" with builtinsjk/consistent-hJeff King2017-06-051-0/+12
| * | | | | | | | git: add hidden --list-builtins optionJeff King2017-06-051-0/+12
| * | | | | | | | version: convert to parse-optionsJeff King2017-06-051-5/+20
| * | | | | | | | diff- and log- family: handle "git cmd -h" earlyJunio C Hamano2017-06-054-0/+12
| * | | | | | | | submodule--helper: show usage for "-h"Jeff King2017-05-301-3/+2
| * | | | | | | | remote-{ext,fd}: print usage message on invalid argumentsJeff King2017-05-302-2/+8
| * | | | | | | | upload-archive: handle "-h" option earlyJeff King2017-05-301-1/+4
| * | | | | | | | credential: handle invalid arguments earlierJeff King2017-05-301-2/+2
* | | | | | | | | Merge branch 'ab/perf-remove-index-lock'Junio C Hamano2017-06-191-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | perf: work around the tested repo having an index.lockab/perf-remove-index-lockÆvar Arnfjörð Bjarmason2017-06-051-1/+8
* | | | | | | | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-1936-525/+539
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: rename diff_fill_sha1_info to diff_fill_oid_infoBrandon Williams2017-06-051-9/+9
| * | | | | | | | | | diffcore-rename: use is_empty_blob_oidBrandon Williams2017-06-051-2/+2
| * | | | | | | | | | tree-diff: convert path_appendnew to object_idBrandon Williams2017-06-051-3/+3
| * | | | | | | | | | tree-diff: convert diff_tree_paths to struct object_idBrandon Williams2017-06-053-38/+39
| * | | | | | | | | | tree-diff: convert try_to_follow_renames to struct object_idBrandon Williams2017-06-051-3/+5
| * | | | | | | | | | builtin/diff-tree: cleanup references to sha1Brandon Williams2017-06-051-5/+3