summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/sha1-loose-object-info-check-existence'Junio C Hamano2013-12-052-6/+15
|\
| * sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existenceJunio C Hamano2013-11-062-6/+15
* | Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano2013-12-053-97/+121
|\ \
| * | t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fixJunio C Hamano2013-11-041-0/+15
| * | t1005: reindentJunio C Hamano2013-11-042-89/+89
| * | unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-041-8/+17
* | | Merge branch 'jc/ref-excludes'Junio C Hamano2013-12-056-2/+155
|\ \ \
| * | | rev-parse: introduce --exclude=<glob> to tame wildcardsjc/ref-excludesJunio C Hamano2013-11-013-0/+43
| * | | rev-list --exclude: export add/clear-ref-exclusion and ref-excluded APIJunio C Hamano2013-11-012-23/+28
| * | | rev-list --exclude: testsJunio C Hamano2013-11-011-0/+42
| * | | document --exclude optionJohannes Sixt2013-11-011-0/+15
| * | | revision: introduce --exclude=<glob> to tame wildcardsJunio C Hamano2013-08-302-2/+51
* | | | Merge branch 'nv/parseopt-opt-arg'Junio C Hamano2013-12-057-14/+63
|\ \ \ \
| * | | | rev-parse --parseopt: add the --stuck-long modenv/parseopt-opt-argNicolas Vigier2013-10-313-6/+55
| * | | | Use the word 'stuck' instead of 'sticked'Nicolas Vigier2013-10-314-8/+8
* | | | | Merge branch 'bc/http-100-continue'Junio C Hamano2013-12-053-10/+28
|\ \ \ \ \
| * | | | | remote-curl: fix large pushes with GSSAPIbc/http-100-continueBrian M. Carlson2013-10-311-2/+9
| * | | | | remote-curl: pass curl slot_results back through run_slotJeff King2013-10-311-9/+13
| * | | | | http: return curl's AUTHAVAIL via slot_resultsJeff King2013-10-312-0/+7
* | | | | | Merge branch 'jc/merge-base-reflog'Junio C Hamano2013-12-053-18/+195
|\ \ \ \ \ \
| * | | | | | merge-base: teach "--fork-point" modejc/merge-base-reflogJunio C Hamano2013-10-293-2/+173
| * | | | | | merge-base: use OPT_CMDMODE and clarify the command line parsingJunio C Hamano2013-10-231-16/+22
* | | | | | | Merge branch 'jk/replace-perl-in-built-scripts'Junio C Hamano2013-12-054-5/+5
|\ \ \ \ \ \ \
| * | | | | | | use @@PERL@@ in built scriptsjk/replace-perl-in-built-scriptsJeff King2013-10-294-5/+5
* | | | | | | | Merge branch 'jh/loose-object-dirs-creation-race'Junio C Hamano2013-12-051-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file.c:create_tmpfile(): Fix race when creating loose object dirsjh/loose-object-dirs-creation-raceJohan Herland2013-10-281-1/+3
* | | | | | | | | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-0515-33/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: do not die when leaving broken detached HEADjk/robustify-parse-commitJeff King2013-10-241-4/+4
| * | | | | | | | | use parse_commit_or_die instead of custom messageJeff King2013-10-242-4/+2
| * | | | | | | | | use parse_commit_or_die instead of segfaultingJeff King2013-10-242-4/+4
| * | | | | | | | | assume parse_commit checks for NULL commitJeff King2013-10-245-7/+5
| * | | | | | | | | assume parse_commit checks commit->object.parsedJeff King2013-10-244-11/+6
| * | | | | | | | | log_tree_diff: die when we fail to parse a commitJeff King2013-10-243-3/+11
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ak/submodule-foreach-quoting'Junio C Hamano2013-12-052-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule foreach: skip eval for more than one argumentak/submodule-foreach-quotingAnders Kaseorg2013-09-272-1/+15
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Sync with 1.8.5.1Junio C Hamano2013-12-033-3/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Git 1.8.5.1v1.8.5.1Junio C Hamano2013-12-034-3/+13
| * | | | | | | | | ref-iteration doc: add_submodule_odb() returns 0 for successNick Townsend2013-12-031-2/+2
* | | | | | | | | | Merge branch 'nd/glossary-content-pathspec-markup'Junio C Hamano2013-12-031-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | glossary-content.txt: fix documentation of "**" patternsnd/glossary-content-pathspec-markupNguyễn Thái Ngọc Duy2013-11-211-3/+3
* | | | | | | | | | | Merge branch 'jj/doc-markup-gitcli'Junio C Hamano2013-12-031-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/gitcli.txt: fix double quotesjj/doc-markup-gitcliJason St. John2013-11-201-5/+5
* | | | | | | | | | | | Merge branch 'jj/doc-markup-hints-in-coding-guidelines'Junio C Hamano2013-12-031-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | State correct usage of literal examples in man pages in the coding standardsjj/doc-markup-hints-in-coding-guidelinesJason St. John2013-11-181-3/+31
* | | | | | | | | | | | | Merge branch 'jj/log-doc'Junio C Hamano2013-12-031-26/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/git-log.txt: mark-up fix and minor rephasingjj/log-docJason St. John2013-11-131-23/+23
| * | | | | | | | | | | | | Documentation/git-log: update "--log-size" descriptionJason St. John2013-11-131-5/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jj/rev-list-options-doc'Junio C Hamano2013-12-031-156/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/rev-list-options.txt: fix some grammatical issues and typosjj/rev-list-options-docJason St. John2013-11-181-13/+14
| * | | | | | | | | | | | | Documentation/rev-list-options.txt: fix mark-upJason St. John2013-11-181-148/+78
| |/ / / / / / / / / / / /
View Lorry Controller Status