Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rev-parse(1): logically group optionsrj/doc-rev-parse | John Keeping | 2013-07-22 | 1 | -40/+64 |
* | rev-parse: remove restrictions on some options | John Keeping | 2013-07-22 | 1 | -15/+13 |
* | Update draft release notes to 1.8.3.4 | Junio C Hamano | 2013-07-21 | 1 | -0/+5 |
* | Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maint | Junio C Hamano | 2013-07-21 | 1 | -1/+1 |
|\ | |||||
| * | fetch-options.txt: prevent a wildcard refspec from getting misformatted | Junio C Hamano | 2013-06-07 | 1 | -1/+1 |
* | | Merge branch 'dk/maint-t5150-dirname' into maint | Junio C Hamano | 2013-07-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | tests: allow sha1's as part of the path | Dennis Kaarsemaker | 2013-06-17 | 1 | -1/+1 |
* | | | Merge branch 'dk/version-gen-gitdir' into maint | Junio C Hamano | 2013-07-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | GIT-VERSION-GEN: support non-standard $GIT_DIR path | Dennis Kaarsemaker | 2013-06-17 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'nk/config-local-doc' into maint | Junio C Hamano | 2013-07-21 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | config: Add description of --local option | Namhyung Kim | 2013-06-17 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'kb/diff-blob-blob-doc' into maint | Junio C Hamano | 2013-07-21 | 1 | -7/+7 |
|\ \ \ | |||||
| * | | | Documentation: Move "git diff <blob> <blob>" | Kevin Bracey | 2013-06-18 | 1 | -7/+7 |
| |/ / | |||||
* | | | Merge branch 'mm/merge-in-dirty-worktree-doc' into maint | Junio C Hamano | 2013-07-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Documentation/git-merge.txt: weaken warning about uncommited changes | Matthieu Moy | 2013-06-18 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint | Junio C Hamano | 2013-07-21 | 9 | -21/+20 |
|\ \ \ | |||||
| * | | | fix "builtin-*" references to be "builtin/*" | Phil Hord | 2013-06-18 | 9 | -21/+20 |
| |/ / | |||||
* | | | Merge branch 'ft/doc-git-transport' into maint | Junio C Hamano | 2013-07-21 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | documentation: add git:// transport security notice | Fraser Tweedale | 2013-06-26 | 1 | -0/+3 |
* | | | | Merge branch 'mh/maint-lockfile-overflow' into maint | Junio C Hamano | 2013-07-21 | 1 | -4/+6 |
|\ \ \ \ | |||||
| * | | | | lockfile: fix buffer overflow in path handling | Michael Haggerty | 2013-07-07 | 1 | -4/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jc/maint-diff-core-safecrlf' into maint | Junio C Hamano | 2013-07-21 | 2 | -1/+17 |
|\ \ \ \ | |||||
| * | | | | diff: demote core.safecrlf=true to core.safecrlf=warn | Junio C Hamano | 2013-06-25 | 2 | -1/+17 |
* | | | | | t9801: git-p4: check ignore files with client spec | Vitor Antunes | 2013-07-21 | 1 | -3/+20 |
* | | | | | Start preparing for 1.8.3.4 | Junio C Hamano | 2013-07-19 | 2 | -1/+16 |
* | | | | | apply.c::find_name_traditional(): do not initialize len to the line's length | Stefan Beller | 2013-07-19 | 1 | -1/+1 |
* | | | | | http-push.c::add_send_request(): do not initialize transfer_request | Stefan Beller | 2013-07-19 | 1 | -1/+1 |
* | | | | | Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maint | Junio C Hamano | 2013-07-19 | 2 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | test-lint: detect 'export FOO=bar' | Thomas Rast | 2013-07-08 | 1 | -0/+1 |
| * | | | | | t9902: fix 'test A == B' to use = operator | Thomas Rast | 2013-07-08 | 1 | -1/+1 |
* | | | | | | Merge branch 'rr/name-rev-stdin-doc' into maint | Junio C Hamano | 2013-07-19 | 1 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | name-rev doc: rewrite --stdin paragraph | Ramkumar Ramachandra | 2013-07-07 | 1 | -2/+4 |
* | | | | | | | Merge branch 'ft/diff-rename-default-score-is-half' into maint | Junio C Hamano | 2013-07-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff-options: document default similarity index | Fraser Tweedale | 2013-07-05 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jc/t1512-fix' into maint | Junio C Hamano | 2013-07-19 | 2 | -11/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | get_short_sha1(): correctly disambiguate type-limited abbreviation | Junio C Hamano | 2013-07-01 | 1 | -1/+1 |
| * | | | | | | | | t1512: correct leftover constants from earlier edition | Junio C Hamano | 2013-07-01 | 1 | -10/+22 |
* | | | | | | | | | Merge branch 'vl/typofix' into maint | Junio C Hamano | 2013-07-19 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | random typofixes (committed missing a 't', successful missing an 's') | Veres Lajos | 2013-06-19 | 3 | -3/+3 |
* | | | | | | | | | | Merge branch 'wk/doc-git-has-grown' into maint | Junio C Hamano | 2013-07-19 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | user-manual: Update download size for Git and the kernel | W. Trevor King | 2013-06-23 | 1 | -3/+3 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ys/cygstart' into maint | Junio C Hamano | 2013-07-19 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | web--browse: support /usr/bin/cygstart on Cygwin | Yaakov Selkowitz | 2013-06-21 | 2 | -3/+9 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mm/push-force-is-dangerous' into maint | Junio C Hamano | 2013-07-19 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation/git-push.txt: explain better cases where --force is dangerous | Matthieu Moy | 2013-06-18 | 1 | -0/+9 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs/logical-vs-binary-or' into maint | Junio C Hamano | 2013-07-19 | 3 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | use logical OR (||) instead of binary OR (|) in logical context | René Scharfe | 2013-06-13 | 3 | -6/+6 |
* | | | | | | | | | | | Merge branch 'js/test-ln-s-add' into maint | Junio C Hamano | 2013-07-19 | 30 | -333/+351 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t4011: remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -10/+25 |
| * | | | | | | | | | | | t6035: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -26/+47 |