Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'ap/branch' | Junio C Hamano | 2006-12-13 | 1 | -5/+87 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | branch --color: change default color selection. | Junio C Hamano | 2006-12-13 | 1 | -2/+2 | |
| * | | | | | | | | | Colourise git-branch output | Andy Parkins | 2006-12-12 | 1 | -5/+87 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'js/merge' | Junio C Hamano | 2006-12-13 | 19 | -179/+715 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | merge-recursive: add/add really is modify/modify with an empty base | Johannes Schindelin | 2006-12-12 | 2 | -30/+26 | |
| * | | | | | | | | | Merge branch 'master' into js/merge | Junio C Hamano | 2006-12-12 | 31 | -363/+675 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Get rid of the dependency on RCS' merge program | Johannes Schindelin | 2006-12-12 | 8 | -89/+20 | |
| * | | | | | | | | | | merge-file: support -p and -q; fix compile warnings | Johannes Schindelin | 2006-12-06 | 1 | -9/+16 | |
| * | | | | | | | | | | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 2006-12-06 | 5 | -0/+191 | |
| * | | | | | | | | | | xdl_merge(): fix and simplify conflict handling | Johannes Schindelin | 2006-12-05 | 1 | -16/+5 | |
| * | | | | | | | | | | xdl_merge(): fix thinko | Johannes Schindelin | 2006-12-02 | 1 | -2/+2 | |
| * | | | | | | | | | | xdl_merge(): fix an off-by-one bug | Johannes Schindelin | 2006-12-02 | 1 | -5/+5 | |
| * | | | | | | | | | | merge-recursive: use xdl_merge(). | Junio C Hamano | 2006-12-02 | 1 | -57/+41 | |
| * | | | | | | | | | | xmerge: make return value from xdl_merge() more usable. | Junio C Hamano | 2006-12-02 | 1 | -10/+7 | |
| * | | | | | | | | | | xdiff: add xdl_merge() | Johannes Schindelin | 2006-12-02 | 5 | -3/+444 | |
* | | | | | | | | | | | send-pack: tighten checks for remote names | Junio C Hamano | 2006-12-13 | 2 | -1/+22 | |
* | | | | | | | | | | | git-push: accept tag <tag> as advertised. | Junio C Hamano | 2006-12-13 | 1 | -5/+30 | |
* | | | | | | | | | | | spurious .sp in manpages | Junio C Hamano | 2006-12-13 | 1 | -0/+14 | |
* | | | | | | | | | | | git merge: reword failure message. | Junio C Hamano | 2006-12-13 | 1 | -1/+8 | |
* | | | | | | | | | | | Remove uncontested renamed files during merge. | Shawn Pearce | 2006-12-13 | 2 | -1/+98 | |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2006-12-13 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | git-svn: correctly display fatal() error messages | Eric Wong | 2006-12-13 | 1 | -1/+1 | |
| * | | | | | | | | | git-svn: exit with status 1 for test failures | Eric Wong | 2006-12-13 | 1 | -8/+12 | |
* | | | | | | | | | | Allow subcommand.color and color.subcommand color configuration | Andy Parkins | 2006-12-13 | 6 | -12/+15 | |
* | | | | | | | | | | git-push: document removal of remote ref with :<dst> pathspec | Junio C Hamano | 2006-12-13 | 1 | -6/+9 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | git-svn: correctly handle packed-refs in refs/remotes/ | Eric Wong | 2006-12-12 | 1 | -1/+9 | |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2006-12-12 | 2 | -19/+23 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Clarify fetch error for missing objects. | Alex Riesen | 2006-12-12 | 1 | -7/+8 | |
| * | | | | | | | | Move Fink and Ports check to after config file | Brian Gernhardt | 2006-12-12 | 1 | -12/+15 | |
* | | | | | | | | | add test case for recursive merge | Junio C Hamano | 2006-12-12 | 1 | -0/+70 | |
* | | | | | | | | | git-svn: correctly display fatal() error messages | Eric Wong | 2006-12-12 | 1 | -1/+1 | |
* | | | | | | | | | git-svn: allow dcommit to take an alternate head | Eric Wong | 2006-12-12 | 2 | -7/+10 | |
* | | | | | | | | | git-svn: enable logging of information not supported by git | Eric Wong | 2006-12-12 | 1 | -18/+184 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | shortlog: fix segfault on empty authorname | Junio C Hamano | 2006-12-11 | 1 | -1/+2 | |
* | | | | | | | | shortlog: remove "[PATCH]" prefix from shortlog output | Junio C Hamano | 2006-12-11 | 1 | -2/+8 | |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2006-12-11 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Make sure the empty tree exists when needed in merge-recursive. | Shawn O. Pearce | 2006-12-11 | 1 | -1/+1 | |
| * | | | | | | Don't use memcpy when source and dest. buffers may overlap | Jim Meyering | 2006-12-11 | 1 | -1/+1 | |
| * | | | | | | no need to install manpages as executable | Chris Wright | 2006-12-11 | 1 | -2/+2 | |
* | | | | | | | Documentation: simpler shared repository creation | J. Bruce Fields | 2006-12-08 | 1 | -13/+14 | |
* | | | | | | | shortlog: fix segfault on empty authorname | Jeff King | 2006-12-08 | 1 | -2/+2 | |
* | | | | | | | Add branch.*.merge warning and documentation update | Josef Weidendorfer | 2006-12-08 | 2 | -2/+20 | |
* | | | | | | | Fix perl/ build. | Junio C Hamano | 2006-12-08 | 2 | -1/+2 | |
* | | | | | | | git-svn: use do_switch for --follow-parent if the SVN library supports it | Eric Wong | 2006-12-08 | 1 | -7/+39 | |
* | | | | | | | Fix documentation copy&paste typo | Uwe Zeisberger | 2006-12-08 | 1 | -1/+1 | |
* | | | | | | | git-svn: extra error check to ensure we open a file correctly | Eric Wong | 2006-12-08 | 1 | -0/+3 | |
* | | | | | | | Documentation: update git-clone man page with new behavior | J. Bruce Fields | 2006-12-07 | 1 | -13/+12 | |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2006-12-06 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | cvsserver: Avoid miscounting bytes in Perl v5.8.x | Martin Langhoff | 2006-12-06 | 1 | -0/+1 | |
* | | | | | | | change the unpack limit treshold to a saner value | Nicolas Pitre | 2006-12-06 | 1 | -1/+1 |