Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/read-tree-ignore' | Junio C Hamano | 2006-12-13 | 9 | -20/+139 |
|\ | |||||
| * | read-tree: document --exclude-per-directory | Junio C Hamano | 2006-12-05 | 2 | -2/+16 |
| * | Loosen "working file will be lost" check in Porcelain-ish | Junio C Hamano | 2006-12-05 | 2 | -3/+4 |
| * | read-tree: further loosen "working file will be lost" check. | Junio C Hamano | 2006-12-05 | 6 | -15/+119 |
* | | Merge branch 'ew/rerere' | Junio C Hamano | 2006-12-13 | 4 | -2/+106 |
|\ \ | |||||
| * | | rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am | Eric Wong | 2006-12-09 | 2 | -0/+16 |
| * | | git-rerere: add 'gc' command. | Junio C Hamano | 2006-12-09 | 2 | -24/+57 |
| * | | rerere: add clear, diff, and status commands | Eric Wong | 2006-12-09 | 2 | -2/+57 |
* | | | Merge branch 'np/addcommit' | Junio C Hamano | 2006-12-13 | 6 | -122/+230 |
|\ \ \ | |||||
| * | | | git-commit: allow --only to lose what was staged earlier. | Junio C Hamano | 2006-12-10 | 1 | -11/+1 |
| * | | | Documentation/git-commit: rewrite to make it more end-user friendly. | Junio C Hamano | 2006-12-09 | 1 | -76/+157 |
| * | | | make 'git add' a first class user friendly interface to the index | Nicolas Pitre | 2006-12-04 | 4 | -35/+72 |
* | | | | Merge branch 'lh/branch-rename' | Junio C Hamano | 2006-12-13 | 5 | -26/+257 |
|\ \ \ \ | |||||
| * | | | | git-branch: let caller specify logmsg | Lars Hjemli | 2006-12-05 | 3 | -10/+10 |
| * | | | | rename_ref: use lstat(2) when testing for symlink | Lars Hjemli | 2006-12-05 | 2 | -1/+8 |
| * | | | | git-branch: add options and tests for branch renaming | Lars Hjemli | 2006-12-05 | 5 | -26/+250 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jc/commit-careful' | Junio C Hamano | 2006-12-13 | 2 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | git-commit: show --summary after successful commit. | Junio C Hamano | 2006-11-25 | 2 | -0/+4 |
* | | | | | Merge branch 'ap/clone-origin' | Junio C Hamano | 2006-12-13 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Explicitly add the default "git pull" behaviour to .git/config on clone | Andy Parkins | 2006-12-06 | 1 | -1/+3 |
* | | | | | | Merge branch 'jc/numstat' | Junio C Hamano | 2006-12-13 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff --numstat: show binary with '-' to match "apply --numstat" | Junio C Hamano | 2006-12-11 | 1 | -1/+4 |
* | | | | | | | Merge branch 'rr/cvsexportcommit' | Junio C Hamano | 2006-12-13 | 2 | -166/+145 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make cvsexportcommit work with filenames with spaces and non-ascii characters. | Robin Rosenberg | 2006-12-11 | 2 | -166/+145 |
| |/ / / / / / | |||||
* | | | | | | | 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 |