summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-128-89/+20
* | | | merge-file: support -p and -q; fix compile warningsJohannes Schindelin2006-12-061-9/+16
* | | | Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-065-0/+191
* | | | xdl_merge(): fix and simplify conflict handlingJohannes Schindelin2006-12-051-16/+5
* | | | xdl_merge(): fix thinkoJohannes Schindelin2006-12-021-2/+2
* | | | xdl_merge(): fix an off-by-one bugJohannes Schindelin2006-12-021-5/+5
* | | | merge-recursive: use xdl_merge().Junio C Hamano2006-12-021-57/+41
* | | | xmerge: make return value from xdl_merge() more usable.Junio C Hamano2006-12-021-10/+7
* | | | xdiff: add xdl_merge()Johannes Schindelin2006-12-025-3/+444
|/ / /
* | | Merge branch 'maint'Junio C Hamano2006-12-021-5/+5
|\ \ \ | |/ /
| * | git-svn: avoid fetching files twice in the same revisionEric Wong2006-12-021-5/+5
* | | git-merge: fix confusion between tag and branchJunio C Hamano2006-12-021-5/+5
* | | De-emphasise the symbolic link documentation.Andy Parkins2006-12-011-18/+11
* | | git-diff: Introduce --index and deprecate --cached.Andreas Ericsson2006-12-012-3/+5
* | | ls-files: Give hints when errors happen.Andreas Ericsson2006-12-011-1/+5
* | | pack-objects: remove redundent status informationNicolas Pitre2006-11-291-2/+4
* | | Merge master.kernel.org:/pub/scm/gitk/gitkJunio C Hamano2006-11-291-10/+10
|\ \ \
| * | | gitk: Fix enabling/disabling of menu items on Mac OS XPaul Mackerras2006-11-231-10/+10
* | | | Merge branch 'maint'Junio C Hamano2006-11-293-5/+31
|\ \ \ \ | | |/ / | |/| |
| * | | Document git-repo-config --bool/--int options.Andy Parkins2006-11-291-0/+6
| * | | tutorial: talk about user.name early and don't start with commit -aJunio C Hamano2006-11-291-5/+24
| * | | git-blame: fix rev parameter handling.Alex Riesen2006-11-291-0/+1
* | | | Merge branch 'jc/globfetch'Junio C Hamano2006-11-283-20/+85
|\ \ \ \
| * | | | fetch-pack: do not barf when duplicate re patterns are givenJunio C Hamano2006-11-251-0/+25
| * | | | git-fetch: allow forcing glob pattern in refspecJunio C Hamano2006-11-251-4/+8
| * | | | Merge branch 'master' into jc/globfetchJunio C Hamano2006-11-2518-311/+1014
| |\ \ \ \
| * | | | | git-fetch: allow glob pattern in refspecJunio C Hamano2006-11-231-0/+35
| * | | | | git-fetch: fix dumb protocol transport to fetch from pack-pruned refJunio C Hamano2006-11-231-15/+13
| * | | | | git-fetch: reuse ls-remote result.Junio C Hamano2006-11-231-5/+8
* | | | | | Merge branch 'maint'Junio C Hamano2006-11-281-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | git blame -C: fix output format tweaks when crossing file boundary.Junio C Hamano2006-11-281-5/+5
* | | | | | git-svn: fix multi-initEric Wong2006-11-281-4/+9
* | | | | | git-svn: documentation updatesEric Wong2006-11-281-21/+19
* | | | | | git-svn: color support for the log commandEric Wong2006-11-281-20/+47
* | | | | | ident.c: Trim hint printed when gecos is empty.Han-Wen Nienhuys2006-11-281-5/+10
* | | | | | Fix broken bash completion of local refs.Shawn O. Pearce2006-11-281-18/+19
* | | | | | Teach bash how to complete long options for git-commit.Shawn O. Pearce2006-11-281-0/+16
* | | | | | git-svn: fix output reporting from the delta fetcherEric Wong2006-11-281-20/+15
* | | | | | git-svn: error out when the SVN connection fails during a fetchEric Wong2006-11-281-1/+8
* | | | | | shortlog: remove range checkRené Scharfe2006-11-281-3/+1
* | | | | | git-svn: update tests for recent changesEric Wong2006-11-274-2/+10
* | | | | | git-svn: enable delta transfers during fetches when using SVN:: libsEric Wong2006-11-271-5/+189
| |_|_|_|/ |/| | | |
* | | | | sha1_object_info(): be consistent with read_sha1_file()Johannes Schindelin2006-11-271-15/+20
* | | | | shortlog: use pagerJohannes Schindelin2006-11-271-1/+1
* | | | | cvsimport: style fixup.Junio C Hamano2006-11-271-84/+84
* | | | | git-svn: use ~/.subversion config files when using SVN:: librariesEric Wong2006-11-271-2/+4
* | | | | Teach bash about git-am/git-apply and their whitespace options.Shawn O. Pearce2006-11-271-0/+53
* | | | | Cache the list of merge strategies and available commands during load.Shawn O. Pearce2006-11-271-1/+19
* | | | | Support --strategy=x completion in addition to --strategy x.Shawn O. Pearce2006-11-271-10/+20
* | | | | Teach bash about git-repo-config.Shawn O. Pearce2006-11-271-0/+154