summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pull: use git-rev-parse --parseopt for option parsingpt/pull-optparsePaul Tan2015-06-021-40/+57
* pull: handle git-fetch's options as wellPaul Tan2015-06-024-6/+68
* Merge branch 'pt/pull-tests' into pt/pull-optparseJunio C Hamano2015-06-022-36/+175
|\
| * t5520: check reflog action in fast-forward mergept/pull-testsPaul Tan2015-05-291-3/+10
| * t5521: test --dry-run does not make any changesPaul Tan2015-05-291-0/+13
| * t5520: test --rebase failure on unborn branch with indexPaul Tan2015-05-291-0/+15
| * t5520: test --rebase with multiple branchesPaul Tan2015-05-291-0/+9
| * t5520: test work tree fast-forward when fetch updates headPaul Tan2015-05-291-0/+21
| * t5520: test for failure if index has unresolved entriesPaul Tan2015-05-291-0/+19
| * t5520: test no merge candidates casesPaul Tan2015-05-181-0/+55
| * t5520: prevent field splitting in content comparisonsPaul Tan2015-05-181-35/+35
* | Sixth batch for 2.5 cycleJunio C Hamano2015-06-011-1/+50
* | Merge branch 'sb/test-bitmap-free-at-end'Junio C Hamano2015-06-011-1/+1
|\ \
| * | test_bitmap_walk: free bitmap with bitmap_freesb/test-bitmap-free-at-endJeff King2015-05-221-1/+1
* | | Merge branch 'mm/rebase-i-post-rewrite-exec'Junio C Hamano2015-06-012-41/+58
|\ \ \
| * | | t5407: use <<- to align the expected outputmm/rebase-i-post-rewrite-execJunio C Hamano2015-05-221-40/+40
| * | | rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2015-05-222-6/+6
| * | | rebase -i: demonstrate incorrect behavior of post-rewriteMatthieu Moy2015-05-221-0/+17
* | | | Merge branch 'fm/fetch-raw-sha1'Junio C Hamano2015-06-016-16/+116
|\ \ \ \
| * | | | upload-pack: optionally allow fetching reachable sha1fm/fetch-raw-sha1Fredrik Medley2015-05-226-6/+97
| * | | | upload-pack: prepare to extend allow-tip-sha1-in-wantFredrik Medley2015-05-222-10/+19
| * | | | config.txt: clarify allowTipSHA1InWant with camelCaseFredrik Medley2015-05-211-2/+2
* | | | | Merge branch 'sg/help-group'Junio C Hamano2015-06-017-51/+117
|\ \ \ \ \
| * | | | | help: respect new common command groupingSébastien Guimmara2015-05-211-1/+23
| * | | | | command-list.txt: drop the "common" tagSébastien Guimmara2015-05-211-21/+21
| * | | | | generate-cmdlist: parse common group commandsEric Sunshine2015-05-213-25/+52
| * | | | | command-list.txt: add the common groups blockSébastien Guimmara2015-05-212-21/+33
| * | | | | command-list: prepare machinery for upcoming "common groups" sectionEric Sunshine2015-05-213-3/+8
* | | | | | Merge branch 'mm/log-format-raw-doc'Junio C Hamano2015-06-012-2/+14
|\ \ \ \ \ \
| * | | | | | Documentation/log: clarify sha1 non-abbreviation in log --rawmm/log-format-raw-docMatthieu Moy2015-05-201-1/+4
| * | | | | | Documentation/log: clarify what --raw meansMatthieu Moy2015-05-181-1/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dt/cat-file-follow-symlinks'Junio C Hamano2015-06-017-19/+601
|\ \ \ \ \ \
| * | | | | | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinksDavid Turner2015-05-203-7/+348
| * | | | | | sha1_name: get_sha1_with_context learns to follow symlinksDavid Turner2015-05-202-12/+28
| * | | | | | tree-walk: learn get_tree_entry_follow_symlinksDavid Turner2015-05-202-0/+224
* | | | | | | Merge branch 'rs/janitorial'Junio C Hamano2015-06-017-26/+9
|\ \ \ \ \ \ \
| * | | | | | | dir: remove unused variable sbrs/janitorialRené Scharfe2015-05-201-2/+0
| * | | | | | | clean: remove unused variable bufRené Scharfe2015-05-201-2/+0
| * | | | | | | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-205-22/+9
* | | | | | | | Merge branch 'jk/stash-options'Junio C Hamano2015-06-012-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | stash: recognize "--help" for subcommandsjk/stash-optionsJeff King2015-05-201-0/+11
| * | | | | | | | stash: complain about unknown flagsJeff King2015-05-202-1/+9
* | | | | | | | | Merge branch 'da/mergetool-winmerge'Junio C Hamano2015-06-013-2/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetools: add winmerge as a builtin toolDavid Aguilar2015-05-201-0/+36
| * | | | | | | | | mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar2015-05-202-2/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mc/commit-doc-grammofix'Junio C Hamano2015-06-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/git-commit: grammofixmc/commit-doc-grammofixMichael Coleman2015-05-191-1/+1
* | | | | | | | | | Merge branch 'jh/filter-empty-contents'Junio C Hamano2015-06-012-1/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contentsJim Hill2015-05-182-1/+27
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-06-012-2/+2
|\ \ \ \ \ \ \ \ \ \