summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-2411-52/+126
|\
| * GIT 1.6.0.1v1.6.0.1Junio C Hamano2008-08-241-6/+11
| * Merge branch 'ag/maint-combine-diff-fix' into maintJunio C Hamano2008-08-242-0/+28
| |\
| | * Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-232-0/+28
| * | Merge branch 'mv/maint-merge-fix' into maintJunio C Hamano2008-08-244-8/+32
| |\ \
| | * | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-234-8/+32
| | |/
| * | Documentation: clarify pager configurationJonathan Nieder2008-08-242-3/+9
| * | Documentation: clarify pager.<cmd> configurationJonathan Nieder2008-08-241-3/+5
| * | Clean up the git-p4 documentationSimon Hausmann2008-08-241-31/+38
| * | Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UXMiklos Vajna2008-08-231-0/+1
| |/
* | git-submodule - Use "get_default_remote" from git-parse-remoteMark Levedahl2008-08-241-3/+2
* | Merge branch 'maint'Junio C Hamano2008-08-236-5/+10
|\ \ | |/
| * unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano2008-08-233-2/+6
| * git-p4: Fix one-liner in p4_write_pipe function.Tor Arvid Lund2008-08-221-1/+1
| * Completion: add missing '=' for 'diff --diff-filter'Eric Raible2008-08-221-1/+1
| * Fix 'git help help'Miklos Vajna2008-08-211-1/+2
* | 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
View Lorry Controller Status