summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/maint-ident-to-git-memmove'Junio C Hamano2011-09-021-2/+2
|\
| * Use memmove in ident_to_gitThomas Rast2011-08-291-2/+2
* | Merge branch 'tr/maint-format-patch-empty-output'Junio C Hamano2011-09-022-4/+28
|\ \
| * | Document negated forms of format-patch --to --cc --add-headersThomas Rast2011-08-291-1/+8
| * | t4014: "no-add-headers" is actually called "no-add-header"Thomas Rast2011-08-291-2/+2
| * | t4014: invoke format-patch with --stdout where intendedThomas Rast2011-08-291-2/+2
| * | t4014: check for empty files from git format-patch --stdoutThomas Rast2011-08-291-2/+19
* | | Merge branch 'gb/maint-am-stgit-author-to-from-fix'Junio C Hamano2011-09-021-1/+1
|\ \ \
| * | | am: fix stgit patch manglingGiuseppe Bilotta2011-08-291-1/+1
* | | | Merge branch 'gb/maint-am-patch-format-error-message'Junio C Hamano2011-09-022-1/+15
|\ \ \ \
| * | | | am: format is in $patch_format, not parse_patchGiuseppe Bilotta2011-08-291-1/+2
* | | | | Merge branch 'ms/daemon-timeout-is-in-seconds'Junio C Hamano2011-09-021-5/+5
|\ \ \ \ \
| * | | | | git-daemon.txt: specify --timeout in secondsMichael Stapelberg2011-08-281-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bg/t5540-osx-grep'Junio C Hamano2011-09-021-2/+6
|\ \ \ \ \
| * | | | | t5540-http-test: shorten grep patternBrian Gernhardt2011-08-281-2/+6
* | | | | | Merge branch 'jc/clean-exclude-doc'Junio C Hamano2011-09-022-6/+9
|\ \ \ \ \ \
| * | | | | | Documentation: clarify "git clean -e <pattern>"Junio C Hamano2011-08-282-6/+9
* | | | | | | Merge branch 'mg/maint-notes-C-doc'Junio C Hamano2011-09-021-2/+5
|\ \ \ \ \ \ \
| * | | | | | | git-notes.txt: clarify -C vs. copy and -FMichael J Gruber2011-08-251-2/+5
| |/ / / / / /
* | | | | | | Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano2011-09-027-0/+231
|\ \ \ \ \ \ \
| * | | | | | | push: Don't push a repository with unpushed submodulesFredrik Gustafsson2011-08-207-0/+231
* | | | | | | | Merge branch 'rc/diff-cleanup-records'Junio C Hamano2011-09-021-37/+51
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rc/histogram-diff' into HEADJunio C Hamano2011-08-1714-285/+655
| |\ \ \ \ \ \ \ \
| * | | | | | | | | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan2011-08-171-36/+50
* | | | | | | | | | Merge branch 'fk/use-kwset-pickaxe-grep-f'Junio C Hamano2011-09-029-34/+1830
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | obstack: Fix portability issuesFredrik Kuivinen2011-08-283-36/+6
| * | | | | | | | | | Use kwset in grepFredrik Kuivinen2011-08-203-23/+49
| * | | | | | | | | | Use kwset in pickaxeFredrik Kuivinen2011-08-202-11/+25
| * | | | | | | | | | Adapt the kwset code to GitFredrik Kuivinen2011-08-202-26/+26
| * | | | | | | | | | Add string search routines from GNU grepFredrik Kuivinen2011-08-202-0/+834
| * | | | | | | | | | Add obstack.[ch] from EGLIBC 2.10Fredrik Kuivinen2011-08-203-0/+952
* | | | | | | | | | | Merge branch 'en/merge-recursive-2'Junio C Hamano2011-09-0210-430/+2170
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren2011-08-141-4/+12
| * | | | | | | | | | | merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren2011-08-142-3/+22
| * | | | | | | | | | | t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyElijah Newren2011-08-141-0/+69
| * | | | | | | | | | | merge-recursive: Avoid unnecessary file rewritesElijah Newren2011-08-142-9/+27
| * | | | | | | | | | | t6022: Additional tests checking for unnecessary updates of filesElijah Newren2011-08-141-0/+91
| * | | | | | | | | | | merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren2011-08-142-15/+21
| * | | | | | | | | | | t6022: Add testcase for spurious "refusing to lose untracked" messagesElijah Newren2011-08-141-0/+26
| * | | | | | | | | | | t3030: fix accidental success in symlink renameJeff King2011-08-141-2/+5
| * | | | | | | | | | | merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-142-26/+58
| * | | | | | | | | | | merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-142-3/+20
| * | | | | | | | | | | merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren2011-08-141-16/+30
| * | | | | | | | | | | merge-recursive: Make modify/delete handling code reusableElijah Newren2011-08-142-36/+50
| * | | | | | | | | | | merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-143-38/+32
| * | | | | | | | | | | merge-recursive: Create function for merging with branchname:file markersElijah Newren2011-08-141-9/+33
| * | | | | | | | | | | merge-recursive: Record more data needed for merging with dual renamesElijah Newren2011-08-141-3/+39
| * | | | | | | | | | | merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren2011-08-141-42/+62
| * | | | | | | | | | | merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren2011-08-141-33/+27
| * | | | | | | | | | | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-142-18/+14