summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'sp/maint-pack-memuse' into maintJunio C Hamano2008-07-161-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ls/maint-mailinfo-patch-label' into maintJunio C Hamano2008-07-167-2/+104
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/maint-daemon-syslog' into maintJunio C Hamano2008-07-161-20/+50
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase-i: keep old parents when preserving mergesStephan Beyer2008-07-161-0/+2
| * | | | | | | | | | t7600-merge: Use test_expect_failure to test option parsingJohannes Sixt2008-07-161-30/+6
| * | | | | | | | | | Fix buffer overflow in prepare_attr_stackDmitry Potapov2008-07-161-6/+9
| * | | | | | | | | | Fix buffer overflow in git diffDmitry Potapov2008-07-165-25/+34
| * | | | | | | | | | Fix buffer overflow in git-grepDmitry Potapov2008-07-161-12/+15
| * | | | | | | | | | git-cvsserver: fix call to nonexistant cleanupWorkDir()Lars Noschinski2008-07-161-1/+1
| * | | | | | | | | | Documentation/git-cherry-pick.txt et al.: Fix misleading -n descriptionPetr Baudis2008-07-162-13/+13
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | t/Makefile: use specified shell when running aggregation scriptSungHyun Nam2008-07-161-1/+1
* | | | | | | | | | parse-options.c: make check_typos() staticNanako Shiraishi2008-07-161-1/+1
* | | | | | | | | | builtin-describe.c: make a global variable "pattern" staticNanako Shiraishi2008-07-161-1/+1
* | | | | | | | | | cache-tree.c: make cache_tree_find() staticNanako Shiraishi2008-07-162-3/+1
* | | | | | | | | | t/aggregate-results: whitespace fixJunio C Hamano2008-07-161-5/+5
* | | | | | | | | | t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"Eric Wong2008-07-161-1/+1
* | | | | | | | | | Merge branch 'mv/merge-in-c'Junio C Hamano2008-07-1524-219/+1916
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reduce_heads(): protect from duplicate inputJunio C Hamano2008-07-142-2/+31
| * | | | | | | | | | reduce_heads(): thinkofixSverre Hvammen Johansen2008-07-132-1/+12
| * | | | | | | | | | Add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+46
| * | | | | | | | | | t6021: add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+4
| * | | | | | | | | | Teach merge.log to "git-merge" againJunio C Hamano2008-07-102-0/+9
| * | | | | | | | | | Build in mergeMiklos Vajna2008-07-076-2/+1157
| * | | | | | | | | | Fix t7601-merge-pull-config.sh on AIXMiklos Vajna2008-07-061-7/+7
| * | | | | | | | | | git-commit-tree: make it usable from other builtinsMiklos Vajna2008-07-062-30/+45
| * | | | | | | | | | Add new test case to ensure git-merge prepends the custom merge messageMiklos Vajna2008-07-061-0/+37
| * | | | | | | | | | Add new test case to ensure git-merge reduces octopus parents when possibleMiklos Vajna2008-06-301-0/+63
| * | | | | | | | | | Introduce reduce_heads()Junio C Hamano2008-06-302-0/+47
| * | | | | | | | | | Introduce get_merge_bases_many()Junio C Hamano2008-06-301-18/+38
| * | | | | | | | | | Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna2008-06-301-0/+52
| * | | | | | | | | | Introduce get_octopus_merge_bases() in commit.cMiklos Vajna2008-06-302-0/+28
| * | | | | | | | | | git-fmt-merge-msg: make it usable from other builtinsMiklos Vajna2008-06-302-66/+92
| * | | | | | | | | | Move read_cache_unmerged() to read-cache.cMiklos Vajna2008-06-303-24/+33
| * | | | | | | | | | Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna2008-06-301-0/+129
| * | | | | | | | | | Move parse-options's skip_prefix() to git-compat-util.hMiklos Vajna2008-06-303-19/+32
| * | | | | | | | | | Move commit_list_count() to commit.cMiklos Vajna2008-06-303-8/+9
| * | | | | | | | | | Move split_cmdline() to alias.cMiklos Vajna2008-06-303-53/+55
* | | | | | | | | | | Merge branch 'ag/rewrite_one'Junio C Hamano2008-07-151-6/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix quadratic performance in rewrite_one.Alexander N. Gavrilov2008-07-131-6/+24
* | | | | | | | | | | | Merge branch 'sp/win'Junio C Hamano2008-07-153-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | We need to check for msys as well as Windows in add--interactive.Mike Pape2008-07-111-1/+1
| * | | | | | | | | | | | Convert CR/LF to LF in tag signaturesJohannes Schindelin2008-07-111-0/+10
| * | | | | | | | | | | | Fixed text file auto-detection: treat EOF character 032 at the end of file as...Dmitry Kakurin2008-07-111-0/+4
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/more-win'Junio C Hamano2008-07-157-26/+58
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | help (Windows): Display HTML in default browser using Windows' shell APISteffen Prohaska2008-07-133-1/+38
| * | | | | | | | | | | | help.c: Add support for htmldir relative to git_exec_path()Steffen Prohaska2008-07-131-3/+5
| * | | | | | | | | | | | Move code interpreting path relative to exec-dir to new function system_path()Steffen Prohaska2008-07-134-22/+15
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'js/maint-pretty-mailmap'Junio C Hamano2008-07-152-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add pretty format %aN which gives the author name, respecting .mailmapJohannes Schindelin2008-07-112-2/+27
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-1515-66/+66
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
View Lorry Controller Status