summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff_opt_parse(): use convert_i() when handling --abbrev=<num>mh/numparseMichael Haggerty2015-03-191-1/+2
* diff_opt_parse(): use convert_i() when handling "-l<num>"Michael Haggerty2015-03-191-1/+2
* opt_arg(): simplify pointer handlingMichael Haggerty2015-03-191-5/+3
* opt_arg(): report errors parsing option valuesMichael Haggerty2015-03-191-2/+2
* opt_arg(): use convert_i() in implementationMichael Haggerty2015-03-191-20/+8
* opt_arg(): val is always non-NULLMichael Haggerty2015-03-191-1/+1
* builtin_diff(): detect errors when parsing --unified argumentMichael Haggerty2015-03-191-6/+7
* handle_revision_opt(): use convert_ui() when handling "--abbrev="Michael Haggerty2015-03-191-1/+2
* strtoul_ui(), strtol_i(): remove functionsMichael Haggerty2015-03-191-26/+0
* handle_revision_opt(): use convert_i() when handling "-<digit>"Michael Haggerty2015-03-191-2/+2
* handle_revision_opt(): use skip_prefix() in many placesMichael Haggerty2015-03-191-29/+30
* write_subdirectory(): use convert_ui() for parsing modeMichael Haggerty2015-03-191-1/+2
* cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"Michael Haggerty2015-03-191-1/+2
* numparse: new module for parsing integral numbersMichael Haggerty2015-03-193-0/+388
* Post 2.3 cyce (batch #10)Junio C Hamano2015-03-173-300/+321
* Merge branch 'mg/doc-status-color-slot'Junio C Hamano2015-03-172-2/+5
|\
| * config,completion: add color.status.unmergedmg/doc-status-color-slotMichael J Gruber2015-03-102-2/+5
* | Merge branch 'mg/status-v-v'Junio C Hamano2015-03-173-67/+60
|\ \
| * | commit/status: show the index-worktree diff with -v -vMichael J Gruber2015-03-063-0/+35
| * | t7508: test git status -vMichael J Gruber2015-03-061-2/+12
| * | t7508: .gitignore 'expect' and 'output' filesJunio C Hamano2015-03-061-65/+13
| |/
* | Merge branch 'mg/sequencer-commit-messages-always-verbatim'Junio C Hamano2015-03-172-0/+33
|\ \
| * | sequencer: preserve commit messagesmg/sequencer-commit-messages-always-verbatimMichael J Gruber2015-03-062-0/+33
* | | Merge branch 'sg/completion-remote'Junio C Hamano2015-03-172-5/+21
|\ \ \
| * | | completion: simplify __git_remotes()sg/completion-remoteSZEDER Gábor2015-03-061-5/+2
| * | | completion: add a test for __git_remotes() helper functionSZEDER Gábor2015-03-061-0/+19
| | |/ | |/|
* | | Merge branch 'es/rebase-i-count-todo'Junio C Hamano2015-03-172-1/+11
|\ \ \
| * | | rebase-interactive: re-word "item count" commentes/rebase-i-count-todoEric Sunshine2015-03-061-1/+1
| * | | rebase-interactive: suppress whitespace preceding item countEric Sunshine2015-03-062-0/+10
* | | | Merge branch 'ak/git-done-help-cleanup'Junio C Hamano2015-03-171-3/+2
|\ \ \ \
| * | | | git: make was_alias and done_help non-staticak/git-done-help-cleanupAlexander Kuleshov2015-03-061-3/+2
| | |/ / | |/| |
* | | | Merge branch 'rs/zip-text'Junio C Hamano2015-03-172-2/+70
|\ \ \ \
| * | | | archive-zip: mark text files in archivesrs/zip-textRené Scharfe2015-03-052-2/+70
| | |_|/ | |/| |
* | | | Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-1710-13/+2
|\ \ \ \
| * | | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-0510-13/+2
| |/ / /
* | | | Sync with 2.3.3Junio C Hamano2015-03-133-2/+42
|\ \ \ \
| * | | | Git 2.3.3v2.3.3Junio C Hamano2015-03-134-3/+43
| * | | | Merge branch 'mr/doc-clean-f-f' into maintJunio C Hamano2015-03-131-2/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'ak/t5516-typofix' into maintJunio C Hamano2015-03-131-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/diff-test-updates' into maintJunio C Hamano2015-03-1311-175/+550
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/diffcore-rename-duplicate' into maintJunio C Hamano2015-03-132-13/+110
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bw/kwset-use-unsigned' into maintJunio C Hamano2015-03-134-7/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano2015-03-131-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mg/doc-remote-tags-or-not' into maintJunio C Hamano2015-03-131-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano2015-03-132-1/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano2015-03-133-37/+64
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-134-2/+399
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/daemon-interpolate' into maintJunio C Hamano2015-03-131-15/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-interpolate' into maintJunio C Hamano2015-03-133-6/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #9)stockJunio C Hamano2015-03-101-0/+7