summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.8.2' into maint-1.8.3maint-1.8.3Junio C Hamano2013-09-051-2/+2
|\
| * Documentation/git-merge.txt: fix formatting of example blockmaint-1.8.2Andreas Schwab2013-09-051-2/+2
* | Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano2013-09-031-0/+1
|\ \ | |/
| * fix shell syntax error in templateThorsten Glaser2013-08-301-0/+1
* | parse-options: fix clang opterror() -Wunused-value warningEric Sunshine2013-08-091-1/+1
* | fix typo in documentation of git-svnFelix Gruber2013-08-051-1/+1
* | Documentation/rev-list-options: add missing word in --*-parentsTorstein Hegge2013-08-051-1/+1
* | log doc: the argument to --encoding is not optionalJonathan Nieder2013-08-052-2/+2
* | Git 1.8.3.4v1.8.3.4Junio C Hamano2013-07-222-2/+3
* | update URL to the marc.info mail archiveOndřej Bílka2013-07-223-4/+4
* | Update draft release notes to 1.8.3.4Junio C Hamano2013-07-211-0/+5
* | Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maintJunio C Hamano2013-07-211-1/+1
|\ \
| * | fetch-options.txt: prevent a wildcard refspec from getting misformattedJunio C Hamano2013-06-071-1/+1
* | | Merge branch 'dk/maint-t5150-dirname' into maintJunio C Hamano2013-07-211-1/+1
|\ \ \
| * | | tests: allow sha1's as part of the pathDennis Kaarsemaker2013-06-171-1/+1
* | | | Merge branch 'dk/version-gen-gitdir' into maintJunio C Hamano2013-07-211-1/+1
|\ \ \ \
| * | | | GIT-VERSION-GEN: support non-standard $GIT_DIR pathDennis Kaarsemaker2013-06-171-1/+1
| |/ / /
* | | | Merge branch 'nk/config-local-doc' into maintJunio C Hamano2013-07-211-0/+9
|\ \ \ \
| * | | | config: Add description of --local optionNamhyung Kim2013-06-171-0/+9
| |/ / /
* | | | Merge branch 'kb/diff-blob-blob-doc' into maintJunio C Hamano2013-07-211-7/+7
|\ \ \ \
| * | | | Documentation: Move "git diff <blob> <blob>"Kevin Bracey2013-06-181-7/+7
| |/ / /
* | | | Merge branch 'mm/merge-in-dirty-worktree-doc' into maintJunio C Hamano2013-07-211-2/+2
|\ \ \ \
| * | | | Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy2013-06-181-2/+2
| |/ / /
* | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maintJunio C Hamano2013-07-219-21/+20
|\ \ \ \
| * | | | fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-189-21/+20
| |/ / /
* | | | Merge branch 'ft/doc-git-transport' into maintJunio C Hamano2013-07-211-0/+3
|\ \ \ \
| * | | | documentation: add git:// transport security noticeFraser Tweedale2013-06-261-0/+3
* | | | | Merge branch 'mh/maint-lockfile-overflow' into maintJunio C Hamano2013-07-211-4/+6
|\ \ \ \ \
| * | | | | lockfile: fix buffer overflow in path handlingMichael Haggerty2013-07-071-4/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'jc/maint-diff-core-safecrlf' into maintJunio C Hamano2013-07-212-1/+17
|\ \ \ \ \
| * | | | | diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano2013-06-252-1/+17
* | | | | | t9801: git-p4: check ignore files with client specVitor Antunes2013-07-211-3/+20
* | | | | | Start preparing for 1.8.3.4Junio C Hamano2013-07-192-1/+16
* | | | | | apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
* | | | | | http-push.c::add_send_request(): do not initialize transfer_requestStefan Beller2013-07-191-1/+1
* | | | | | Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maintJunio C Hamano2013-07-192-1/+2
|\ \ \ \ \ \
| * | | | | | test-lint: detect 'export FOO=bar'Thomas Rast2013-07-081-0/+1
| * | | | | | t9902: fix 'test A == B' to use = operatorThomas Rast2013-07-081-1/+1
* | | | | | | Merge branch 'rr/name-rev-stdin-doc' into maintJunio C Hamano2013-07-191-2/+4
|\ \ \ \ \ \ \
| * | | | | | | name-rev doc: rewrite --stdin paragraphRamkumar Ramachandra2013-07-071-2/+4
* | | | | | | | Merge branch 'ft/diff-rename-default-score-is-half' into maintJunio C Hamano2013-07-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-options: document default similarity indexFraser Tweedale2013-07-051-1/+1
* | | | | | | | | Merge branch 'jc/t1512-fix' into maintJunio C Hamano2013-07-192-11/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | get_short_sha1(): correctly disambiguate type-limited abbreviationJunio C Hamano2013-07-011-1/+1
| * | | | | | | | | t1512: correct leftover constants from earlier editionJunio C Hamano2013-07-011-10/+22
* | | | | | | | | | Merge branch 'vl/typofix' into maintJunio C Hamano2013-07-193-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-193-3/+3
* | | | | | | | | | | Merge branch 'wk/doc-git-has-grown' into maintJunio C Hamano2013-07-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | user-manual: Update download size for Git and the kernelW. Trevor King2013-06-231-3/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ys/cygstart' into maintJunio C Hamano2013-07-192-3/+9
|\ \ \ \ \ \ \ \ \ \ \