summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff test: reading a directory as a file need not error outsb/diff-orderfile-configJonathan Nieder2014-01-101-4/+0
* diff: add diff.orderfile configuration variableSamuel Bronson2013-12-184-0/+23
* diff: let "git diff -O" read orderfile from any file and fail properlySamuel Bronson2013-12-182-15/+34
* t4056: add new tests for "git diff -O"Samuel Bronson2013-12-181-0/+68
* Update draft release notes to 1.9Junio C Hamano2013-12-121-1/+17
* Merge branch 'jn/scripts-updates'Junio C Hamano2013-12-1253-600/+87
|\
| * remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-2610-28/+19
| * test: replace shebangs with descriptions in shell librariesJonathan Nieder2013-11-2615-20/+64
| * test: make FILEMODE a lazy prereqJonathan Nieder2013-11-268-17/+4
| * contrib: remove git-p4importJonathan Nieder2013-11-263-533/+0
| * mark contributed hooks executableJonathan Nieder2013-11-254-2/+0
| * mark perl test scripts executableJonathan Nieder2013-11-2510-0/+0
| * mark Windows build scripts executableJonathan Nieder2013-11-255-0/+0
* | Merge branch 'cn/thin-push-capability'Junio C Hamano2013-12-122-8/+25
|\ \
| * | send-pack: don't send a thin pack to a server which doesn't support itcn/thin-push-capabilityCarlos Martín Nieto2013-11-252-8/+25
* | | Merge branch 'jk/remove-deprecated'Junio C Hamano2013-12-1218-411/+48
|\ \ \
| * \ \ Sync with 1.8.5jk/remove-deprecatedJunio C Hamano2013-12-0528-7537/+9220
| |\ \ \
| * | | | stop installing git-tar-tree linkJonathan Nieder2013-12-032-2/+1
| * | | | peek-remote: remove deprecated alias of ls-remoteJohn Keeping2013-11-126-48/+0
| * | | | lost-found: remove deprecated commandJohn Keeping2013-11-126-111/+0
| * | | | tar-tree: remove deprecated commandJohn Keeping2013-11-129-173/+5
| * | | | repo-config: remove deprecated alias for "git config"John Keeping2013-11-129-37/+2
* | | | | Merge branch 'tr/commit-slab-cleanup'Junio C Hamano2013-12-121-8/+31
|\ \ \ \ \
| * | | | | commit-slab: sizeof() the right type in xrealloctr/commit-slab-cleanupThomas Rast2013-12-021-1/+1
| * | | | | commit-slab: declare functions "static inline"Thomas Rast2013-11-271-6/+20
| * | | | | commit-slab: document clear_$slabname()Thomas Rast2013-11-271-1/+10
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs/doc-submitting-patches'Junio C Hamano2013-12-121-2/+9
|\ \ \ \ \
| * | | | | SubmittingPatches: document how to handle multiple patchesrs/doc-submitting-patchesRené Scharfe2013-11-271-2/+9
* | | | | | Merge branch 'tr/doc-git-cherry'Junio C Hamano2013-12-121-33/+110
|\ \ \ \ \ \
| * | | | | | Documentation: revamp git-cherry(1)tr/doc-git-cherryThomas Rast2013-11-271-33/+110
* | | | | | | Merge branch 'cl/p4-use-diff-tree'Junio C Hamano2013-12-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git p4: Use git diff-tree instead of format-patchCrestez Dan Leonard2013-11-221-1/+1
* | | | | | | | Merge branch 'tr/config-multivalue-lift-max'Junio C Hamano2013-12-122-6/+77
|\ \ \ \ \ \ \ \
| * | | | | | | | config: arbitrary number of matches for --unset and --replace-alltr/config-multivalue-lift-maxThomas Rast2013-12-062-6/+77
* | | | | | | | | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'Junio C Hamano2013-12-1214-320/+503
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch: improve the error messages emitted for conflicting refspecsmh/fetch-tags-in-addition-to-normal-refsMichael Haggerty2013-10-302-8/+31
| * | | | | | | | | handle_duplicate(): mark error message for translationMichael Haggerty2013-10-301-1/+1
| * | | | | | | | | ref_remote_duplicates(): extract a function handle_duplicate()Michael Haggerty2013-10-301-8/+10
| * | | | | | | | | ref_remove_duplicates(): simplify loop logicMichael Haggerty2013-10-303-26/+38
| * | | | | | | | | t5536: new test of refspec conflicts when fetchingMichael Haggerty2013-10-301-0/+96
| * | | | | | | | | ref_remove_duplicates(): avoid redundant bisectionMichael Haggerty2013-10-301-6/+6
| * | | | | | | | | git-fetch.txt: improve description of tag auto-followingMichael Haggerty2013-10-301-7/+7
| * | | | | | | | | fetch-options.txt: simplify ifdef/ifndef/endif usageMichael Haggerty2013-10-301-4/+1
| * | | | | | | | | fetch, remote: properly convey --no-prune options to subprocessesMichael Haggerty2013-10-302-5/+5
| * | | | | | | | | builtin/remote.c:update(): use struct argv_arrayMichael Haggerty2013-10-301-16/+17
| * | | | | | | | | builtin/remote.c: reorder function definitionsMichael Haggerty2013-10-301-81/+78
| * | | | | | | | | query_refspecs(): move some constants out of the loopMichael Haggerty2013-10-301-2/+2
| * | | | | | | | | fetch --prune: prune only based on explicit refspecsMichael Haggerty2013-10-304-42/+30
| * | | | | | | | | fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty2013-10-307-38/+78
| * | | | | | | | | fetch: only opportunistically update references based on command lineMichael Haggerty2013-10-301-12/+32
View Lorry Controller Status