Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tr/maint-ident-to-git-memmove' | Junio C Hamano | 2011-09-02 | 1 | -2/+2 |
|\ | |||||
| * | Use memmove in ident_to_git | Thomas Rast | 2011-08-29 | 1 | -2/+2 |
* | | Merge branch 'tr/maint-format-patch-empty-output' | Junio C Hamano | 2011-09-02 | 2 | -4/+28 |
|\ \ | |||||
| * | | Document negated forms of format-patch --to --cc --add-headers | Thomas Rast | 2011-08-29 | 1 | -1/+8 |
| * | | t4014: "no-add-headers" is actually called "no-add-header" | Thomas Rast | 2011-08-29 | 1 | -2/+2 |
| * | | t4014: invoke format-patch with --stdout where intended | Thomas Rast | 2011-08-29 | 1 | -2/+2 |
| * | | t4014: check for empty files from git format-patch --stdout | Thomas Rast | 2011-08-29 | 1 | -2/+19 |
* | | | Merge branch 'gb/maint-am-stgit-author-to-from-fix' | Junio C Hamano | 2011-09-02 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | am: fix stgit patch mangling | Giuseppe Bilotta | 2011-08-29 | 1 | -1/+1 |
* | | | | Merge branch 'gb/maint-am-patch-format-error-message' | Junio C Hamano | 2011-09-02 | 2 | -1/+15 |
|\ \ \ \ | |||||
| * | | | | am: format is in $patch_format, not parse_patch | Giuseppe Bilotta | 2011-08-29 | 1 | -1/+2 |
* | | | | | Merge branch 'ms/daemon-timeout-is-in-seconds' | Junio C Hamano | 2011-09-02 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | git-daemon.txt: specify --timeout in seconds | Michael Stapelberg | 2011-08-28 | 1 | -5/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'bg/t5540-osx-grep' | Junio C Hamano | 2011-09-02 | 1 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | t5540-http-test: shorten grep pattern | Brian Gernhardt | 2011-08-28 | 1 | -2/+6 |
* | | | | | | Merge branch 'jc/clean-exclude-doc' | Junio C Hamano | 2011-09-02 | 2 | -6/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: clarify "git clean -e <pattern>" | Junio C Hamano | 2011-08-28 | 2 | -6/+9 |
* | | | | | | | Merge branch 'mg/maint-notes-C-doc' | Junio C Hamano | 2011-09-02 | 1 | -2/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-notes.txt: clarify -C vs. copy and -F | Michael J Gruber | 2011-08-25 | 1 | -2/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'fg/submodule-ff-check-before-push' | Junio C Hamano | 2011-09-02 | 7 | -0/+231 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | push: Don't push a repository with unpushed submodules | Fredrik Gustafsson | 2011-08-20 | 7 | -0/+231 |
* | | | | | | | | Merge branch 'rc/diff-cleanup-records' | Junio C Hamano | 2011-09-02 | 1 | -37/+51 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rc/histogram-diff' into HEAD | Junio C Hamano | 2011-08-17 | 14 | -285/+655 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() | Tay Ray Chuan | 2011-08-17 | 1 | -36/+50 |
* | | | | | | | | | | Merge branch 'fk/use-kwset-pickaxe-grep-f' | Junio C Hamano | 2011-09-02 | 9 | -34/+1830 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | obstack: Fix portability issues | Fredrik Kuivinen | 2011-08-28 | 3 | -36/+6 |
| * | | | | | | | | | | Use kwset in grep | Fredrik Kuivinen | 2011-08-20 | 3 | -23/+49 |
| * | | | | | | | | | | Use kwset in pickaxe | Fredrik Kuivinen | 2011-08-20 | 2 | -11/+25 |
| * | | | | | | | | | | Adapt the kwset code to Git | Fredrik Kuivinen | 2011-08-20 | 2 | -26/+26 |
| * | | | | | | | | | | Add string search routines from GNU grep | Fredrik Kuivinen | 2011-08-20 | 2 | -0/+834 |
| * | | | | | | | | | | Add obstack.[ch] from EGLIBC 2.10 | Fredrik Kuivinen | 2011-08-20 | 3 | -0/+952 |
* | | | | | | | | | | | Merge branch 'en/merge-recursive-2' | Junio C Hamano | 2011-09-02 | 10 | -430/+2170 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge-recursive: Don't re-sort a list whose order we depend upon | Elijah Newren | 2011-08-14 | 1 | -4/+12 |
| * | | | | | | | | | | | merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest | Elijah Newren | 2011-08-14 | 2 | -3/+22 |
| * | | | | | | | | | | | t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify | Elijah Newren | 2011-08-14 | 1 | -0/+69 |
| * | | | | | | | | | | | merge-recursive: Avoid unnecessary file rewrites | Elijah Newren | 2011-08-14 | 2 | -9/+27 |
| * | | | | | | | | | | | t6022: Additional tests checking for unnecessary updates of files | Elijah Newren | 2011-08-14 | 1 | -0/+91 |
| * | | | | | | | | | | | merge-recursive: Fix spurious 'refusing to lose untracked file...' messages | Elijah Newren | 2011-08-14 | 2 | -15/+21 |
| * | | | | | | | | | | | t6022: Add testcase for spurious "refusing to lose untracked" messages | Elijah Newren | 2011-08-14 | 1 | -0/+26 |
| * | | | | | | | | | | | t3030: fix accidental success in symlink rename | Jeff King | 2011-08-14 | 1 | -2/+5 |
| * | | | | | | | | | | | merge-recursive: Fix working copy handling for rename/rename/add/add | Elijah Newren | 2011-08-14 | 2 | -26/+58 |
| * | | | | | | | | | | | merge-recursive: add handling for rename/rename/add-dest/add-dest | Elijah Newren | 2011-08-14 | 2 | -3/+20 |
| * | | | | | | | | | | | merge-recursive: Have conflict_rename_delete reuse modify/delete code | Elijah Newren | 2011-08-14 | 1 | -16/+30 |
| * | | | | | | | | | | | merge-recursive: Make modify/delete handling code reusable | Elijah Newren | 2011-08-14 | 2 | -36/+50 |
| * | | | | | | | | | | | merge-recursive: Consider modifications in rename/rename(2to1) conflicts | Elijah Newren | 2011-08-14 | 3 | -38/+32 |
| * | | | | | | | | | | | merge-recursive: Create function for merging with branchname:file markers | Elijah Newren | 2011-08-14 | 1 | -9/+33 |
| * | | | | | | | | | | | merge-recursive: Record more data needed for merging with dual renames | Elijah Newren | 2011-08-14 | 1 | -3/+39 |
| * | | | | | | | | | | | merge-recursive: Defer rename/rename(2to1) handling until process_entry | Elijah Newren | 2011-08-14 | 1 | -42/+62 |
| * | | | | | | | | | | | merge-recursive: Small cleanups for conflict_rename_rename_1to2 | Elijah Newren | 2011-08-14 | 1 | -33/+27 |
| * | | | | | | | | | | | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base | Elijah Newren | 2011-08-14 | 2 | -18/+14 |