Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/two-way-merge-corner-case-fix' | Junio C Hamano | 2013-12-05 |
|\ | |||
| * | t1005: add test for "read-tree --reset -u A B" | Junio C Hamano | 2013-11-04 |
| * | t1005: reindent | Junio C Hamano | 2013-11-04 |
| * | unpack-trees: fix "read-tree -u --reset A B" with conflicted index | Jeff King | 2013-11-04 |
* | | Merge branch 'jc/ref-excludes' | Junio C Hamano | 2013-12-05 |
|\ \ | |||
| * | | rev-parse: introduce --exclude=<glob> to tame wildcards | Junio C Hamano | 2013-11-01 |
| * | | rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API | Junio C Hamano | 2013-11-01 |
| * | | rev-list --exclude: tests | Junio C Hamano | 2013-11-01 |
| * | | document --exclude option | Johannes Sixt | 2013-11-01 |
| * | | revision: introduce --exclude=<glob> to tame wildcards | Junio C Hamano | 2013-08-30 |
* | | | Merge branch 'nv/parseopt-opt-arg' | Junio C Hamano | 2013-12-05 |
|\ \ \ | |||
| * | | | rev-parse --parseopt: add the --stuck-long mode | Nicolas Vigier | 2013-10-31 |
| * | | | Use the word 'stuck' instead of 'sticked' | Nicolas Vigier | 2013-10-31 |
* | | | | Merge branch 'bc/http-100-continue' | Junio C Hamano | 2013-12-05 |
|\ \ \ \ | |||
| * | | | | remote-curl: fix large pushes with GSSAPI | Brian M. Carlson | 2013-10-31 |
| * | | | | remote-curl: pass curl slot_results back through run_slot | Jeff King | 2013-10-31 |
| * | | | | http: return curl's AUTHAVAIL via slot_results | Jeff King | 2013-10-31 |
* | | | | | Merge branch 'jc/merge-base-reflog' | Junio C Hamano | 2013-12-05 |
|\ \ \ \ \ | |||
| * | | | | | merge-base: teach "--fork-point" mode | Junio C Hamano | 2013-10-29 |
| * | | | | | merge-base: use OPT_CMDMODE and clarify the command line parsing | Junio C Hamano | 2013-10-23 |
* | | | | | | Merge branch 'jk/replace-perl-in-built-scripts' | Junio C Hamano | 2013-12-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | use @@PERL@@ in built scripts | Jeff King | 2013-10-29 |
* | | | | | | | Merge branch 'jh/loose-object-dirs-creation-race' | Junio C Hamano | 2013-12-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs | Johan Herland | 2013-10-28 |
* | | | | | | | | Merge branch 'jk/robustify-parse-commit' | Junio C Hamano | 2013-12-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | checkout: do not die when leaving broken detached HEAD | Jeff King | 2013-10-24 |
| * | | | | | | | | use parse_commit_or_die instead of custom message | Jeff King | 2013-10-24 |
| * | | | | | | | | use parse_commit_or_die instead of segfaulting | Jeff King | 2013-10-24 |
| * | | | | | | | | assume parse_commit checks for NULL commit | Jeff King | 2013-10-24 |
| * | | | | | | | | assume parse_commit checks commit->object.parsed | Jeff King | 2013-10-24 |
| * | | | | | | | | log_tree_diff: die when we fail to parse a commit | Jeff King | 2013-10-24 |
| | |_|_|_|_|/ / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'ak/submodule-foreach-quoting' | Junio C Hamano | 2013-12-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | submodule foreach: skip eval for more than one argument | Anders Kaseorg | 2013-09-27 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Sync with 1.8.5.1 | Junio C Hamano | 2013-12-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Git 1.8.5.1v1.8.5.1 | Junio C Hamano | 2013-12-03 |
| * | | | | | | | | ref-iteration doc: add_submodule_odb() returns 0 for success | Nick Townsend | 2013-12-03 |
* | | | | | | | | | Merge branch 'nd/glossary-content-pathspec-markup' | Junio C Hamano | 2013-12-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | glossary-content.txt: fix documentation of "**" patterns | Nguyễn Thái Ngọc Duy | 2013-11-21 |
* | | | | | | | | | | Merge branch 'jj/doc-markup-gitcli' | Junio C Hamano | 2013-12-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Documentation/gitcli.txt: fix double quotes | Jason St. John | 2013-11-20 |
* | | | | | | | | | | | Merge branch 'jj/doc-markup-hints-in-coding-guidelines' | Junio C Hamano | 2013-12-03 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | State correct usage of literal examples in man pages in the coding standards | Jason St. John | 2013-11-18 |
* | | | | | | | | | | | | Merge branch 'jj/log-doc' | Junio C Hamano | 2013-12-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Documentation/git-log.txt: mark-up fix and minor rephasing | Jason St. John | 2013-11-13 |
| * | | | | | | | | | | | | Documentation/git-log: update "--log-size" description | Jason St. John | 2013-11-13 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'jj/rev-list-options-doc' | Junio C Hamano | 2013-12-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Documentation/rev-list-options.txt: fix some grammatical issues and typos | Jason St. John | 2013-11-18 |
| * | | | | | | | | | | | | Documentation/rev-list-options.txt: fix mark-up | Jason St. John | 2013-11-18 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'mi/typofixes' | Junio C Hamano | 2013-12-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | contrib: typofixes | Masanari Iida | 2013-11-12 |