summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pack-objects: show reused packfile objects in "Counting objects"jk/pack-bitmap-progressJeff King2014-03-171-8/+3
* pack-objects: show progress for reused packfilesJeff King2014-03-171-3/+16
* Update draft release notes to Git 2.0Junio C Hamano2014-03-142-3/+64
* Merge branch 'ta/parse-commit-with-skip-prefix'Junio C Hamano2014-03-141-8/+6
|\
| * commit.c: use skip_prefix() instead of starts_with()ta/parse-commit-with-skip-prefixTanay Abhra2014-03-041-8/+6
* | Merge branch 'sr/add--interactive-term-readkey'Junio C Hamano2014-03-142-1/+4
|\ \
| * | git-add--interactive: warn if module for interactive.singlekey is missingsr/add--interactive-term-readkeySimon Ruderich2014-03-031-0/+3
| * | git-config: document interactive.singlekey requires Term::ReadKeySimon Ruderich2014-03-031-1/+1
* | | Merge branch 'sh/write-pack-file-warning-message-fix'Junio C Hamano2014-03-141-1/+1
|\ \ \
| * | | write_pack_file: use correct variable in diagnosticsh/write-pack-file-warning-message-fixSun He2014-03-031-1/+1
* | | | Merge branch 'nd/strbuf-inline-styles'Junio C Hamano2014-03-141-6/+12
|\ \ \ \
| * | | | strbuf: style fix -- top opening bracket on a separate linend/strbuf-inline-stylesNguyễn Thái Ngọc Duy2014-03-031-6/+12
| | |_|/ | |/| |
* | | | Merge branch 'jn/bisect-coding-style'Junio C Hamano2014-03-141-4/+4
|\ \ \ \
| * | | | git-bisect.sh: fix a few style issuesjn/bisect-coding-styleJacopo Notarstefano2014-03-031-4/+4
| | |_|/ | |/| |
* | | | Merge branch 'mh/replace-refs-variable-rename'Junio C Hamano2014-03-1414-15/+79
|\ \ \ \
| * | | | Document some functions defined in object.cmh/replace-refs-variable-renameMichael Haggerty2014-02-282-1/+35
| * | | | Add docstrings for lookup_replace_object() and do_lookup_replace_object()Michael Haggerty2014-02-282-0/+20
| * | | | rename read_replace_refs to check_replace_refsMichael Haggerty2014-02-2012-14/+24
| | |/ / | |/| |
* | | | Merge branch 'sg/archive-restrict-remote'Junio C Hamano2014-03-145-3/+63
|\ \ \ \
| * | | | add uploadarchive.allowUnreachable optionsg/archive-restrict-remoteScott J. Goldman2014-02-284-2/+33
| * | | | docs: clarify remote restrictions for git-upload-archiveJeff King2014-02-282-1/+30
| |/ / /
* | | | Merge branch 'rt/help-pretty-prints-cmd-names'Junio C Hamano2014-03-141-4/+3
|\ \ \ \
| * | | | help.c: rename function "pretty_print_string_list"rt/help-pretty-prints-cmd-namesRalf Thielow2014-02-281-4/+3
| | |/ / | |/| |
* | | | Merge branch 'jl/doc-submodule-update-checkout'Junio C Hamano2014-03-142-2/+11
|\ \ \ \
| * | | | submodule update: consistently document the '--checkout' optionjl/doc-submodule-update-checkoutJens Lehmann2014-02-282-2/+11
* | | | | Merge branch 'jk/doc-coding-guideline'Junio C Hamano2014-03-141-0/+11
|\ \ \ \ \
| * | | | | CodingGuidelines: mention C whitespace rulesjk/doc-coding-guidelineJeff King2014-02-281-0/+11
| | |/ / / | |/| | |
* | | | | Merge branch 'da/difftool-git-files'Junio C Hamano2014-03-142-16/+16
|\ \ \ \ \
| * | | | | t7800: add a difftool test for .git-filesda/difftool-git-filesJunio C Hamano2014-03-051-0/+14
| * | | | | difftool: support repositories with .git-filesDavid Aguilar2014-02-241-16/+2
| |/ / / /
* | | | | Merge branch 'tg/index-v4-format'Junio C Hamano2014-03-148-1/+142
|\ \ \ \ \
| * | | | | read-cache: add index.version config variabletg/index-v4-formatThomas Gummerer2014-02-243-9/+57
| * | | | | test-lib: allow setting the index format versionThomas Gummerer2014-02-244-0/+20
| * | | | | introduce GIT_INDEX_VERSION environment variableThomas Gummerer2014-02-243-1/+74
| | |_|/ / | |/| | |
* | | | | Merge branch 'nd/i18n-progress'Junio C Hamano2014-03-148-12/+13
|\ \ \ \ \
| * | | | | i18n: mark all progress lines for translationnd/i18n-progressNguyễn Thái Ngọc Duy2014-02-248-12/+13
| |/ / / /
* | | | | Merge branch 'mh/object-code-cleanup'Junio C Hamano2014-03-144-41/+112
|\ \ \ \ \
| * | | | | sha1_file.c: document a bunch of functions defined in the filemh/object-code-cleanupMichael Haggerty2014-02-242-14/+78
| * | | | | sha1_file_name(): declare to return a const stringMichael Haggerty2014-02-243-17/+11
| * | | | | find_pack_entry(): document last_found_packMichael Haggerty2014-02-241-4/+12
| * | | | | replace_object: use struct members instead of an arrayMichael Haggerty2014-02-241-6/+11
| |/ / / /
* | | | | Merge branch 'jn/am-doc-hooks'Junio C Hamano2014-03-141-0/+5
|\ \ \ \ \
| * | | | | am doc: add a pointer to relevant hooksjn/am-doc-hooksJonathan Nieder2014-02-241-0/+5
| |/ / / /
* | | | | Merge branch 'jm/stash-doc-k-for-keep'Junio C Hamano2014-03-141-1/+1
|\ \ \ \ \
| * | | | | stash doc: mention short form -k in save descriptionjm/stash-doc-k-for-keepJohn Marshall2014-02-241-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/remote-pushremote-config-reading'Junio C Hamano2014-03-142-1/+19
|\ \ \ \ \
| * | | | | remote: handle pushremote config in any orderjk/remote-pushremote-config-readingJeff King2014-02-242-1/+19
| |/ / / /
* | | | | Merge branch 'jk/commit-dates-parsing-fix'Junio C Hamano2014-03-146-11/+96
|\ \ \ \ \
| * | | | | show_ident_date: fix tz range checkJeff King2014-03-071-2/+2
| * | | | | log: do not segfault on gmtime errorsJeff King2014-02-242-2/+12