summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "git-clone.txt: remove the restriction on pushing from a shallow clone"jc/revert-clone-doc-update-for-push-from-shallowJunio C Hamano2013-07-151-7/+5
* Update draft release notes for 1.8.4Junio C Hamano2013-07-121-0/+7
* Merge branch 'jc/remote-http-argv-array'Junio C Hamano2013-07-121-16/+16
|\
| * remote-http: use argv-arrayjc/remote-http-argv-arrayJunio C Hamano2013-07-091-16/+16
* | Merge branch 'rs/pickaxe-simplify'Junio C Hamano2013-07-121-7/+4
|\ \
| * | diffcore-pickaxe: simplify has_changes and containsrs/pickaxe-simplifyRené Scharfe2013-07-071-7/+4
* | | Merge branch 'tr/test-lint-no-export-assignment-in-shell'Junio C Hamano2013-07-122-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'Junio C Hamano2013-07-121-2/+4
|\ \ \
| * | | name-rev doc: rewrite --stdin paragraphRamkumar Ramachandra2013-07-071-2/+4
* | | | Merge branch 'ft/diff-rename-default-score-is-half'Junio C Hamano2013-07-121-1/+1
|\ \ \ \
| * | | | diff-options: document default similarity indexFraser Tweedale2013-07-051-1/+1
* | | | | Merge branch 'ml/cygwin-does-not-have-fifo'Junio C Hamano2013-07-121-1/+8
|\ \ \ \ \
| * | | | | test-lib.sh - cygwin does not have usable FIFOsml/cygwin-does-not-have-fifoMark Levedahl2013-07-051-1/+8
* | | | | | Merge branch 'tf/gitweb-extra-breadcrumbs'Junio C Hamano2013-07-122-3/+26
|\ \ \ \ \ \
| * | | | | | gitweb: allow extra breadcrumbs to prefix the trailtf/gitweb-extra-breadcrumbsTony Finch2013-07-042-3/+26
* | | | | | | Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-126-14/+17
|\ \ \ \ \ \ \
| * | | | | | | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-036-14/+17
* | | | | | | | Merge branch 'jk/pull-to-integrate'Junio C Hamano2013-07-123-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | pull: change the description to "integrate" changesjk/pull-to-integrateJohn Keeping2013-07-082-2/+2
| * | | | | | | | push: avoid suggesting "merging" remote changesJohn Keeping2013-07-071-6/+6
* | | | | | | | | Merge branch 'jk/maint-config-multi-order'Junio C Hamano2013-07-121-8/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-config(1): clarify precedence of multiple valuesjk/maint-config-multi-orderJohn Keeping2013-07-071-8/+12
| |/ / / / / / / /
* | | | | | | | | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-129-136/+265
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4205 (log-pretty-formats): avoid using `sed`as/log-output-encoding-in-user-formatAlexey Shumkin2013-07-051-16/+10
| * | | | | | | | | t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commit...Alexey Shumkin2013-07-051-13/+28
| * | | | | | | | | t4205, t6006, t7102: make functions better readableAlexey Shumkin2013-07-053-25/+16
| * | | | | | | | | t4205 (log-pretty-formats): revert back single quotesAlexey Shumkin2013-07-051-53/+53
| * | | | | | | | | t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1Alexey Shumkin2013-07-054-18/+18
| * | | | | | | | | t4205: replace .\+ with ..* in sed commandsBrian Gernhardt2013-07-011-2/+2
| * | | | | | | | | pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-269-28/+35
| * | | | | | | | | pretty: Add failing tests: --format output should honor logOutputEncodingAlexey Shumkin2013-06-264-97/+199
| * | | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-22/+26
| * | | | | | | | | t7102 (reset): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-3/+5
| * | | | | | | | | t6006 (rev-list-format): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-63/+77
* | | | | | | | | | git-clone.txt: remove the restriction on pushing from a shallow cloneNguyễn Thái Ngọc Duy2013-07-121-5/+7
* | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-07-111-3/+76
* | | | | | | | | | Merge branch 'jc/t1512-fix'Junio C Hamano2013-07-112-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 'tr/test-v-and-v-subtest-only'Junio C Hamano2013-07-111-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t0000: do not use export X=Ytr/test-v-and-v-subtest-onlyTorsten Bögershausen2013-07-081-1/+2
* | | | | | | | | | | | Merge branch 'af/rebase-i-merge-options'Junio C Hamano2013-07-112-5/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Do not ignore merge options in interactive rebaseaf/rebase-i-merge-optionsArnaud Fontaine2013-07-022-5/+27
* | | | | | | | | | | | | Merge branch 'pb/stash-refuse-to-kill'Junio C Hamano2013-07-115-8/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git stash: avoid data loss when "git stash save" kills a directoryPetr Baudis2013-07-013-2/+40
| * | | | | | | | | | | | | treat_directory(): do not declare submodules to be untrackedJunio C Hamano2013-07-012-6/+21
* | | | | | | | | | | | | | Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano2013-07-112-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano2013-06-252-1/+17