summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-submodule: replace duplicated code with a module_list functionDavid Aguilar2008-08-221-4/+13
* git-merge documentation: more details about resolving conflictsDan Hensgen2008-08-221-6/+18
* Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-224-17/+46
* Revert "Convert output messages in merge-recursive to past tense."Jonathan del Strother2008-08-221-18/+18
* templates/Makefile: install is unnecessary, just use mkdir -pJunio C Hamano2008-08-221-2/+2
* remote.c: add a function for deleting a refspec array and use it (twice)Brandon Casey2008-08-222-2/+28
* filter-branch: Grok special characters in tag namesJohannes Sixt2008-08-212-5/+15
* test-lib: do not remove trash_directory if called with --debugJohannes Schindelin2008-08-211-1/+1
* provide more errors for the "merge into empty head" casePaolo Bonzini2008-08-211-0/+5
* Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'Shawn O. Pearce2008-08-211-1/+4
* config.mak.in: Pass on LDFLAGS from configureNeil Roberts2008-08-211-0/+1
* Merge branch 'maint'Junio C Hamano2008-08-213-4/+10
|\
| * compat/snprintf.c: handle snprintf's that always return the # chars transmittedBrandon Casey2008-08-211-0/+4
| * git-svn: fix dcommit to urls with embedded usernamesEric Wong2008-08-201-3/+5
| * revision.h: make show_early_output an extern which is defined in revision.cBrandon Casey2008-08-201-1/+1
* | Teach "git diff -p" HTML funcname patternsJohan Herland2008-08-202-2/+5
* | Teach "git diff -p" Python funcname patternsKirill Smelkov2008-08-202-0/+3
* | Merge branch 'ml/submodule-foreach'Junio C Hamano2008-08-202-2/+39
|\ \
| * | git-submodule - Add 'foreach' subcommandMark Levedahl2008-08-172-2/+39
* | | Merge branch 'pm/log-exit-code'Junio C Hamano2008-08-202-2/+11
|\ \ \
| * | | Teach git log --exit-code to return an appropriate exit codePeter Valdemar Mørch2008-08-172-5/+5
| * | | Teach git log --check to return an appropriate exit codePeter Valdemar Mørch2008-08-171-0/+9
| |/ /
* | | Merge branch 'sb/commit-tree-minileak'Junio C Hamano2008-08-201-1/+4
|\ \ \
| * | | Fix commit_tree() buffer leakStephan Beyer2008-08-171-1/+4
| |/ /
* | | Merge branch 'pb/reflog-dwim'Junio C Hamano2008-08-201-4/+4
|\ \ \
| * | | builtin-reflog: Allow reflog expire to name partial refPieter de Bie2008-08-171-4/+4
| |/ /
* | | Merge branch 'jc/add-stop-at-symlink'Junio C Hamano2008-08-204-3/+45
|\ \ \
| * | | add: refuse to add working tree items beyond symlinksJunio C Hamano2008-08-043-3/+22
| * | | update-index: refuse to add working tree items beyond symlinksJunio C Hamano2008-08-042-1/+24
* | | | Merge branch 'kh/diff-tree'Junio C Hamano2008-08-203-17/+72
|\ \ \ \
| * | | | Add test for diff-tree --stdin with two treesKarl Hasselström2008-08-111-0/+14
| * | | | Teach git diff-tree --stdin to diff treesKarl Hasselström2008-08-112-9/+39
| * | | | diff-tree: Note that the commit ID is printed with --stdinKarl Hasselström2008-08-111-3/+7
| * | | | Refactoring: Split up diff_tree_stdinKarl Hasselström2008-08-111-12/+19
* | | | | Merge branch 'mg/count-objects'Junio C Hamano2008-08-203-3/+7
|\ \ \ \ \
| * | | | | count-objects: Add total pack size to verbose outputMarcus Griep2008-08-173-3/+7
* | | | | | Merge branch 'mz/push-verbose'Junio C Hamano2008-08-201-2/+11
|\ \ \ \ \ \
| * | | | | | Make push more verbose about illegal combination of optionsMarek Zawirski2008-08-171-2/+11
| |/ / / / /
* | | | | | Merge branch 'jc/index-extended-flags'Junio C Hamano2008-08-202-0/+5
|\ \ \ \ \ \
| * | | | | | index: future proof for "extended" index entriesJunio C Hamano2008-08-172-0/+5
| |/ / / / /
* | | | | | Merge branch 'cc/merge-base-many'Junio C Hamano2008-08-205-28/+133
|\ \ \ \ \ \
| * | | | | | git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise mergeJunio C Hamano2008-07-301-9/+2
| * | | | | | merge-base-many: add trivial tests based on the documentationJunio C Hamano2008-07-291-0/+48
| * | | | | | documentation: merge-base: explain "git merge-base" with more than 2 argsJunio C Hamano2008-07-291-11/+66
| * | | | | | merge-base: teach "git merge-base" to drive underlying merge_bases_many()Christian Couder2008-07-292-8/+17
* | | | | | | Merge branch 'jc/test-deeper'Junio C Hamano2008-08-2050-131/+152
|\ \ \ \ \ \ \
| * | | | | | | tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-1751-134/+152
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'js/parallel-test'Junio C Hamano2008-08-204-7/+14
|\ \ \ \ \ \ \
| * | | | | | | Update t/.gitignore to ignore all trash directoriesMarcus Griep2008-08-181-1/+1
| * | | | | | | Enable parallel testsJohannes Schindelin2008-08-082-2/+7
View Lorry Controller Status