summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pull: suppress error when no remoteref is foundjk/pull-rebase-using-fork-pointJohn Keeping2014-01-171-1/+1
* rebase: fix fork-point with zero argumentsJohn Keeping2014-01-092-3/+12
* rebase: use reflog to find common base with upstreamJohn Keeping2013-12-103-2/+33
* pull: use merge-base --fork-point when appropriateJohn Keeping2013-12-091-9/+1
* 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
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mi/typofixes'Junio C Hamano2013-12-038-10/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | contrib: typofixesmi/typofixesMasanari Iida2013-11-124-4/+4
| * | | | | | | | | | Documentation/technical/http-protocol.txt: typofixesMasanari Iida2013-11-121-2/+2
| * | | | | | | | | | typofixes: fix misspelt commentsMasanari Iida2013-11-123-4/+4
* | | | | | | | | | | Merge branch 'tb/doc-fetch-pack-url'Junio C Hamano2013-12-031-8/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | git-fetch-pack uses URLs like git-fetchtb/doc-fetch-pack-urlTorsten Bögershausen2013-11-111-8/+7
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Sync with 1.8.4.5Junio C Hamano2013-12-024-6/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git 1.8.4.5v1.8.4.5maint-1.8.4Junio C Hamano2013-12-024-3/+17
| * | | | | | | | | | submodule: do not copy unknown update mode from .gitmodulesJunio C Hamano2013-12-022-5/+30
* | | | | | | | | | | Git 1.8.5v1.8.5Junio C Hamano2013-11-272-1/+6
* | | | | | | | | | | Sync with maintJunio C Hamano2013-11-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen2013-11-271-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rh/remote-hg-bzr-updates' (early part)Junio C Hamano2013-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen2013-11-181-1/+1
* | | | | | | | | | Git 1.8.5-rc3v1.8.5-rc3Junio C Hamano2013-11-201-1/+1
View Lorry Controller Status