Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2008-07-16 | 13 | -88/+124 |
|\ | |||||
| * | Start preparing 1.5.6.4 release notes | Junio C Hamano | 2008-07-16 | 2 | -1/+44 |
| * | git fetch-pack: do not complain about "no common commits" in an empty repo | Johannes Schindelin | 2008-07-16 | 1 | -1/+2 |
| * | Merge branch 'js/maint-pretty-mailmap' into maint | Junio C Hamano | 2008-07-16 | 2 | -2/+27 |
| |\ | |||||
| * \ | Merge branch 'sp/maint-bash-completion-optim' into maint | Junio C Hamano | 2008-07-16 | 1 | -18/+50 |
| |\ \ | |||||
| * \ \ | Merge branch 'sp/maint-pack-memuse' into maint | Junio C Hamano | 2008-07-16 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ls/maint-mailinfo-patch-label' into maint | Junio C Hamano | 2008-07-16 | 7 | -2/+104 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'js/maint-daemon-syslog' into maint | Junio C Hamano | 2008-07-16 | 1 | -20/+50 |
| |\ \ \ \ \ | |||||
| * | | | | | | rebase-i: keep old parents when preserving merges | Stephan Beyer | 2008-07-16 | 1 | -0/+2 |
| * | | | | | | t7600-merge: Use test_expect_failure to test option parsing | Johannes Sixt | 2008-07-16 | 1 | -30/+6 |
| * | | | | | | Fix buffer overflow in prepare_attr_stack | Dmitry Potapov | 2008-07-16 | 1 | -6/+9 |
| * | | | | | | Fix buffer overflow in git diff | Dmitry Potapov | 2008-07-16 | 5 | -25/+34 |
| * | | | | | | Fix buffer overflow in git-grep | Dmitry Potapov | 2008-07-16 | 1 | -12/+15 |
| * | | | | | | git-cvsserver: fix call to nonexistant cleanupWorkDir() | Lars Noschinski | 2008-07-16 | 1 | -1/+1 |
| * | | | | | | Documentation/git-cherry-pick.txt et al.: Fix misleading -n description | Petr Baudis | 2008-07-16 | 2 | -13/+13 |
* | | | | | | | t/Makefile: use specified shell when running aggregation script | SungHyun Nam | 2008-07-16 | 1 | -1/+1 |
* | | | | | | | parse-options.c: make check_typos() static | Nanako Shiraishi | 2008-07-16 | 1 | -1/+1 |
* | | | | | | | builtin-describe.c: make a global variable "pattern" static | Nanako Shiraishi | 2008-07-16 | 1 | -1/+1 |
* | | | | | | | cache-tree.c: make cache_tree_find() static | Nanako Shiraishi | 2008-07-16 | 2 | -3/+1 |
* | | | | | | | t/aggregate-results: whitespace fix | Junio C Hamano | 2008-07-16 | 1 | -5/+5 |
* | | | | | | | t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory" | Eric Wong | 2008-07-16 | 1 | -1/+1 |
* | | | | | | | Merge branch 'mv/merge-in-c' | Junio C Hamano | 2008-07-15 | 24 | -219/+1916 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | reduce_heads(): protect from duplicate input | Junio C Hamano | 2008-07-14 | 2 | -2/+31 |
| * | | | | | | | reduce_heads(): thinkofix | Sverre Hvammen Johansen | 2008-07-13 | 2 | -1/+12 |
| * | | | | | | | Add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 | 1 | -0/+46 |
| * | | | | | | | t6021: add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 | 1 | -0/+4 |
| * | | | | | | | Teach merge.log to "git-merge" again | Junio C Hamano | 2008-07-10 | 2 | -0/+9 |
| * | | | | | | | Build in merge | Miklos Vajna | 2008-07-07 | 6 | -2/+1157 |
| * | | | | | | | Fix t7601-merge-pull-config.sh on AIX | Miklos Vajna | 2008-07-06 | 1 | -7/+7 |
| * | | | | | | | git-commit-tree: make it usable from other builtins | Miklos Vajna | 2008-07-06 | 2 | -30/+45 |
| * | | | | | | | Add new test case to ensure git-merge prepends the custom merge message | Miklos Vajna | 2008-07-06 | 1 | -0/+37 |
| * | | | | | | | Add new test case to ensure git-merge reduces octopus parents when possible | Miklos Vajna | 2008-06-30 | 1 | -0/+63 |
| * | | | | | | | Introduce reduce_heads() | Junio C Hamano | 2008-06-30 | 2 | -0/+47 |
| * | | | | | | | Introduce get_merge_bases_many() | Junio C Hamano | 2008-06-30 | 1 | -18/+38 |
| * | | | | | | | Add new test to ensure git-merge handles more than 25 refs. | Miklos Vajna | 2008-06-30 | 1 | -0/+52 |
| * | | | | | | | Introduce get_octopus_merge_bases() in commit.c | Miklos Vajna | 2008-06-30 | 2 | -0/+28 |
| * | | | | | | | git-fmt-merge-msg: make it usable from other builtins | Miklos Vajna | 2008-06-30 | 2 | -66/+92 |
| * | | | | | | | Move read_cache_unmerged() to read-cache.c | Miklos Vajna | 2008-06-30 | 3 | -24/+33 |
| * | | | | | | | Add new test to ensure git-merge handles pull.twohead and pull.octopus | Miklos Vajna | 2008-06-30 | 1 | -0/+129 |
| * | | | | | | | Move parse-options's skip_prefix() to git-compat-util.h | Miklos Vajna | 2008-06-30 | 3 | -19/+32 |
| * | | | | | | | Move commit_list_count() to commit.c | Miklos Vajna | 2008-06-30 | 3 | -8/+9 |
| * | | | | | | | Move split_cmdline() to alias.c | Miklos Vajna | 2008-06-30 | 3 | -53/+55 |
* | | | | | | | | Merge branch 'ag/rewrite_one' | Junio C Hamano | 2008-07-15 | 1 | -6/+24 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix quadratic performance in rewrite_one. | Alexander N. Gavrilov | 2008-07-13 | 1 | -6/+24 |
* | | | | | | | | | Merge branch 'sp/win' | Junio C Hamano | 2008-07-15 | 3 | -1/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | We need to check for msys as well as Windows in add--interactive. | Mike Pape | 2008-07-11 | 1 | -1/+1 |
| * | | | | | | | | | Convert CR/LF to LF in tag signatures | Johannes Schindelin | 2008-07-11 | 1 | -0/+10 |
| * | | | | | | | | | Fixed text file auto-detection: treat EOF character 032 at the end of file as... | Dmitry Kakurin | 2008-07-11 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'js/more-win' | Junio C Hamano | 2008-07-15 | 7 | -26/+58 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | help (Windows): Display HTML in default browser using Windows' shell API | Steffen Prohaska | 2008-07-13 | 3 | -1/+38 |