Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into js/shallow | Junio C Hamano | 2006-12-27 | 28 | -245/+1030 |
|\ | |||||
| * | git-svn: quiet down tests and fix some unportable shell constructs | Eric Wong | 2006-12-26 | 1 | -131/+127 |
| * | t3600: update the test for updated git rm | Junio C Hamano | 2006-12-25 | 1 | -4/+74 |
| * | Merge branch 'jc/skip-count' | Junio C Hamano | 2006-12-25 | 1 | -0/+51 |
| |\ | |||||
| | * | revision: --skip=<n> | Junio C Hamano | 2006-12-20 | 1 | -0/+51 |
| * | | Merge branch 'sb/merge-friendly' | Junio C Hamano | 2006-12-24 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | Display 'theirs' branch name when possible in merge. | Shawn O. Pearce | 2006-12-23 | 1 | -3/+3 |
| * | | | Add a test for git-rerere | Johannes Schindelin | 2006-12-21 | 1 | -0/+154 |
| |/ / | |||||
| * | | Merge branch 'ew/svn-pm' | Junio C Hamano | 2006-12-20 | 8 | -51/+25 |
| |\ \ | |||||
| | * | | git-svn: rename 'commit' command to 'set-tree' | Eric Wong | 2006-12-16 | 3 | -13/+13 |
| | * | | git-svn: remove support for the svn command-line client | Eric Wong | 2006-12-16 | 6 | -38/+12 |
| * | | | Do not create $GIT_DIR/remotes/ directory anymore. | Junio C Hamano | 2006-12-19 | 1 | -4/+3 |
| * | | | Introduce GIT_TEMPLATE_DIR | Johannes Schindelin | 2006-12-19 | 1 | -1/+2 |
| * | | | Revert "fix testsuite: make sure they use templates freshly built from the so... | Junio C Hamano | 2006-12-19 | 11 | -36/+26 |
| * | | | fix testsuite: make sure they use templates freshly built from the source | Junio C Hamano | 2006-12-18 | 11 | -26/+36 |
| | |/ | |/| | |||||
| * | | Merge branch 'js/branch-config' | Junio C Hamano | 2006-12-17 | 2 | -0/+54 |
| |\ \ | |||||
| | * | | git-branch: rename config vars branch.<branch>.*, too | Johannes Schindelin | 2006-12-16 | 1 | -0/+6 |
| | * | | add a function to rename sections in the config | Johannes Schindelin | 2006-12-16 | 1 | -0/+48 |
| | |/ | |||||
| * | | Fix check_file_directory_conflict(). | Junio C Hamano | 2006-12-17 | 1 | -0/+9 |
| |/ | |||||
| * | Add --add option to git-repo-config | Brian Gernhardt | 2006-12-15 | 1 | -0/+10 |
| * | Enable reflogs by default in any repository with a working directory. | Shawn O. Pearce | 2006-12-15 | 1 | -2/+2 |
| * | make commit message a little more consistent and conforting | Nicolas Pitre | 2006-12-15 | 1 | -2/+0 |
| * | Merge branch 'jc/read-tree-ignore' | Junio C Hamano | 2006-12-13 | 1 | -8/+74 |
| |\ | |||||
| | * | read-tree: further loosen "working file will be lost" check. | Junio C Hamano | 2006-12-05 | 1 | -8/+74 |
| * | | Merge branch 'lh/branch-rename' | Junio C Hamano | 2006-12-13 | 1 | -0/+41 |
| |\ \ | |||||
| | * | | rename_ref: use lstat(2) when testing for symlink | Lars Hjemli | 2006-12-05 | 1 | -0/+7 |
| | * | | git-branch: add options and tests for branch renaming | Lars Hjemli | 2006-12-05 | 1 | -0/+34 |
| | |/ | |||||
| * | | Merge branch 'rr/cvsexportcommit' | Junio C Hamano | 2006-12-13 | 1 | -28/+80 |
| |\ \ | |||||
| | * | | Make cvsexportcommit work with filenames with spaces and non-ascii characters. | Robin Rosenberg | 2006-12-11 | 1 | -28/+80 |
| | |/ | |||||
| * | | Merge branch 'js/merge' | Junio C Hamano | 2006-12-13 | 3 | -14/+128 |
| |\ \ | |||||
| | * | | merge-recursive: add/add really is modify/modify with an empty base | Johannes Schindelin | 2006-12-12 | 1 | -1/+11 |
| | * | | Merge branch 'master' into js/merge | Junio C Hamano | 2006-12-12 | 4 | -4/+101 |
| | |\ \ | |||||
| | * | | | Get rid of the dependency on RCS' merge program | Johannes Schindelin | 2006-12-12 | 1 | -13/+1 |
| | * | | | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 2006-12-06 | 1 | -0/+116 |
| * | | | | Remove uncontested renamed files during merge. | Shawn Pearce | 2006-12-13 | 1 | -0/+97 |
| | |/ / | |/| | | |||||
| * | | | add test case for recursive merge | Junio C Hamano | 2006-12-12 | 1 | -0/+70 |
| | |/ | |/| | |||||
| * | | diff -b: ignore whitespace at end of line | Johannes Schindelin | 2006-12-04 | 1 | -4/+2 |
| * | | Merge branch 'maint' | Junio C Hamano | 2006-12-04 | 1 | -0/+13 |
| |\ \ | |||||
| | * | | git-mv: search more precisely for source directory in index | Johannes Schindelin | 2006-12-04 | 1 | -0/+13 |
| * | | | Set permissions of each new file before "cvs add"ing it. | Jim Meyering | 2006-12-04 | 1 | -0/+16 |
| | |/ | |/| | |||||
| * | | git-svn: update tests for recent changes | Eric Wong | 2006-11-27 | 4 | -2/+10 |
| * | | Merge branch 'jc/push-delete-ref' | Junio C Hamano | 2006-11-26 | 1 | -0/+10 |
| |\ \ | |||||
| | * | | Allow git push to delete remote ref. | Junio C Hamano | 2006-11-24 | 1 | -0/+10 |
| * | | | Merge branch 'jc/merge' | Junio C Hamano | 2006-11-26 | 3 | -27/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | remove merge-recursive-old | Junio C Hamano | 2006-11-21 | 3 | -27/+6 |
* | | | | add tests for shallow stuff | Johannes Schindelin | 2006-11-24 | 1 | -0/+45 |
|/ / / | |||||
* | | | config option log.showroot to show the diff of root commits | Peter Baumann | 2006-11-24 | 1 | -0/+1 |
| |/ |/| | |||||
* | | trust-executable-bit: fix breakage for symlinks | Junio C Hamano | 2006-11-22 | 1 | -2/+12 |
|/ | |||||
* | git-fetch: follow lightweit tags as well. | Junio C Hamano | 2006-11-19 | 1 | -0/+16 |
* | git-pull: allow pulling into an empty repository | Linus Torvalds | 2006-11-16 | 1 | -0/+33 |