Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
|/ / / | ||||||
* | | | Merge branch 'maint' | Junio C Hamano | 2006-12-02 | 1 | -5/+5 | |
|\ \ \ | |/ / | ||||||
| * | | git-svn: avoid fetching files twice in the same revision | Eric Wong | 2006-12-02 | 1 | -5/+5 | |
* | | | git-merge: fix confusion between tag and branch | Junio C Hamano | 2006-12-02 | 1 | -5/+5 | |
* | | | De-emphasise the symbolic link documentation. | Andy Parkins | 2006-12-01 | 1 | -18/+11 | |
* | | | git-diff: Introduce --index and deprecate --cached. | Andreas Ericsson | 2006-12-01 | 2 | -3/+5 | |
* | | | ls-files: Give hints when errors happen. | Andreas Ericsson | 2006-12-01 | 1 | -1/+5 | |
* | | | pack-objects: remove redundent status information | Nicolas Pitre | 2006-11-29 | 1 | -2/+4 | |
* | | | Merge master.kernel.org:/pub/scm/gitk/gitk | Junio C Hamano | 2006-11-29 | 1 | -10/+10 | |
|\ \ \ | ||||||
| * | | | gitk: Fix enabling/disabling of menu items on Mac OS X | Paul Mackerras | 2006-11-23 | 1 | -10/+10 | |
* | | | | Merge branch 'maint' | Junio C Hamano | 2006-11-29 | 3 | -5/+31 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Document git-repo-config --bool/--int options. | Andy Parkins | 2006-11-29 | 1 | -0/+6 | |
| * | | | tutorial: talk about user.name early and don't start with commit -a | Junio C Hamano | 2006-11-29 | 1 | -5/+24 | |
| * | | | git-blame: fix rev parameter handling. | Alex Riesen | 2006-11-29 | 1 | -0/+1 | |
* | | | | Merge branch 'jc/globfetch' | Junio C Hamano | 2006-11-28 | 3 | -20/+85 | |
|\ \ \ \ | ||||||
| * | | | | fetch-pack: do not barf when duplicate re patterns are given | Junio C Hamano | 2006-11-25 | 1 | -0/+25 | |
| * | | | | git-fetch: allow forcing glob pattern in refspec | Junio C Hamano | 2006-11-25 | 1 | -4/+8 | |
| * | | | | Merge branch 'master' into jc/globfetch | Junio C Hamano | 2006-11-25 | 18 | -311/+1014 | |
| |\ \ \ \ | ||||||
| * | | | | | git-fetch: allow glob pattern in refspec | Junio C Hamano | 2006-11-23 | 1 | -0/+35 | |
| * | | | | | git-fetch: fix dumb protocol transport to fetch from pack-pruned ref | Junio C Hamano | 2006-11-23 | 1 | -15/+13 | |
| * | | | | | git-fetch: reuse ls-remote result. | Junio C Hamano | 2006-11-23 | 1 | -5/+8 | |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2006-11-28 | 1 | -5/+5 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | git blame -C: fix output format tweaks when crossing file boundary. | Junio C Hamano | 2006-11-28 | 1 | -5/+5 | |
* | | | | | | git-svn: fix multi-init | Eric Wong | 2006-11-28 | 1 | -4/+9 | |
* | | | | | | git-svn: documentation updates | Eric Wong | 2006-11-28 | 1 | -21/+19 | |
* | | | | | | git-svn: color support for the log command | Eric Wong | 2006-11-28 | 1 | -20/+47 | |
* | | | | | | ident.c: Trim hint printed when gecos is empty. | Han-Wen Nienhuys | 2006-11-28 | 1 | -5/+10 | |
* | | | | | | Fix broken bash completion of local refs. | Shawn O. Pearce | 2006-11-28 | 1 | -18/+19 | |
* | | | | | | Teach bash how to complete long options for git-commit. | Shawn O. Pearce | 2006-11-28 | 1 | -0/+16 | |
* | | | | | | git-svn: fix output reporting from the delta fetcher | Eric Wong | 2006-11-28 | 1 | -20/+15 | |
* | | | | | | git-svn: error out when the SVN connection fails during a fetch | Eric Wong | 2006-11-28 | 1 | -1/+8 | |
* | | | | | | shortlog: remove range check | René Scharfe | 2006-11-28 | 1 | -3/+1 | |
* | | | | | | git-svn: update tests for recent changes | Eric Wong | 2006-11-27 | 4 | -2/+10 | |
* | | | | | | git-svn: enable delta transfers during fetches when using SVN:: libs | Eric Wong | 2006-11-27 | 1 | -5/+189 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | sha1_object_info(): be consistent with read_sha1_file() | Johannes Schindelin | 2006-11-27 | 1 | -15/+20 | |
* | | | | | shortlog: use pager | Johannes Schindelin | 2006-11-27 | 1 | -1/+1 | |
* | | | | | cvsimport: style fixup. | Junio C Hamano | 2006-11-27 | 1 | -84/+84 | |
* | | | | | git-svn: use ~/.subversion config files when using SVN:: libraries | Eric Wong | 2006-11-27 | 1 | -2/+4 | |
* | | | | | Teach bash about git-am/git-apply and their whitespace options. | Shawn O. Pearce | 2006-11-27 | 1 | -0/+53 | |
* | | | | | Cache the list of merge strategies and available commands during load. | Shawn O. Pearce | 2006-11-27 | 1 | -1/+19 | |
* | | | | | Support --strategy=x completion in addition to --strategy x. | Shawn O. Pearce | 2006-11-27 | 1 | -10/+20 | |
* | | | | | Teach bash about git-repo-config. | Shawn O. Pearce | 2006-11-27 | 1 | -0/+154 |