aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano2013-12-05
|\
| * t1005: add test for "read-tree --reset -u A B"Junio C Hamano2013-11-04
| * t1005: reindentJunio C Hamano2013-11-04
| * unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-04
* | Merge branch 'jc/ref-excludes'Junio C Hamano2013-12-05
|\ \
| * | rev-parse: introduce --exclude=<glob> to tame wildcardsJunio C Hamano2013-11-01
| * | rev-list --exclude: export add/clear-ref-exclusion and ref-excluded APIJunio C Hamano2013-11-01
| * | rev-list --exclude: testsJunio C Hamano2013-11-01
| * | document --exclude optionJohannes Sixt2013-11-01
| * | revision: introduce --exclude=<glob> to tame wildcardsJunio C Hamano2013-08-30
* | | Merge branch 'nv/parseopt-opt-arg'Junio C Hamano2013-12-05
|\ \ \
| * | | rev-parse --parseopt: add the --stuck-long modeNicolas Vigier2013-10-31
| * | | Use the word 'stuck' instead of 'sticked'Nicolas Vigier2013-10-31
* | | | Merge branch 'bc/http-100-continue'Junio C Hamano2013-12-05
|\ \ \ \
| * | | | remote-curl: fix large pushes with GSSAPIBrian M. Carlson2013-10-31
| * | | | remote-curl: pass curl slot_results back through run_slotJeff King2013-10-31
| * | | | http: return curl's AUTHAVAIL via slot_resultsJeff King2013-10-31
* | | | | Merge branch 'jc/merge-base-reflog'Junio C Hamano2013-12-05
|\ \ \ \ \
| * | | | | merge-base: teach "--fork-point" modeJunio C Hamano2013-10-29
| * | | | | merge-base: use OPT_CMDMODE and clarify the command line parsingJunio C Hamano2013-10-23
* | | | | | Merge branch 'jk/replace-perl-in-built-scripts'Junio C Hamano2013-12-05
|\ \ \ \ \ \
| * | | | | | use @@PERL@@ in built scriptsJeff King2013-10-29
* | | | | | | Merge branch 'jh/loose-object-dirs-creation-race'Junio C Hamano2013-12-05
|\ \ \ \ \ \ \
| * | | | | | | sha1_file.c:create_tmpfile(): Fix race when creating loose object dirsJohan Herland2013-10-28
* | | | | | | | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-05
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: do not die when leaving broken detached HEADJeff King2013-10-24
| * | | | | | | | use parse_commit_or_die instead of custom messageJeff King2013-10-24
| * | | | | | | | use parse_commit_or_die instead of segfaultingJeff King2013-10-24
| * | | | | | | | assume parse_commit checks for NULL commitJeff King2013-10-24
| * | | | | | | | assume parse_commit checks commit->object.parsedJeff King2013-10-24
| * | | | | | | | log_tree_diff: die when we fail to parse a commitJeff King2013-10-24
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ak/submodule-foreach-quoting'Junio C Hamano2013-12-05
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule foreach: skip eval for more than one argumentAnders Kaseorg2013-09-27
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Sync with 1.8.5.1Junio C Hamano2013-12-03
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 1.8.5.1v1.8.5.1Junio C Hamano2013-12-03
| * | | | | | | | ref-iteration doc: add_submodule_odb() returns 0 for successNick Townsend2013-12-03
* | | | | | | | | Merge branch 'nd/glossary-content-pathspec-markup'Junio C Hamano2013-12-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | glossary-content.txt: fix documentation of "**" patternsNguyễn Thái Ngọc Duy2013-11-21
* | | | | | | | | | Merge branch 'jj/doc-markup-gitcli'Junio C Hamano2013-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/gitcli.txt: fix double quotesJason St. John2013-11-20
* | | | | | | | | | | Merge branch 'jj/doc-markup-hints-in-coding-guidelines'Junio C Hamano2013-12-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | State correct usage of literal examples in man pages in the coding standardsJason St. John2013-11-18
* | | | | | | | | | | | Merge branch 'jj/log-doc'Junio C Hamano2013-12-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/git-log.txt: mark-up fix and minor rephasingJason St. John2013-11-13
| * | | | | | | | | | | | Documentation/git-log: update "--log-size" descriptionJason St. John2013-11-13
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jj/rev-list-options-doc'Junio C Hamano2013-12-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/rev-list-options.txt: fix some grammatical issues and typosJason St. John2013-11-18
| * | | | | | | | | | | | Documentation/rev-list-options.txt: fix mark-upJason St. John2013-11-18
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'mi/typofixes'Junio C Hamano2013-12-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | contrib: typofixesMasanari Iida2013-11-12