summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/read-tree-ignore'Junio C Hamano2006-12-139-20/+139
|\
| * read-tree: document --exclude-per-directoryJunio C Hamano2006-12-052-2/+16
| * Loosen "working file will be lost" check in Porcelain-ishJunio C Hamano2006-12-052-3/+4
| * read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-056-15/+119
* | Merge branch 'ew/rerere'Junio C Hamano2006-12-134-2/+106
|\ \
| * | rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong2006-12-092-0/+16
| * | git-rerere: add 'gc' command.Junio C Hamano2006-12-092-24/+57
| * | rerere: add clear, diff, and status commandsEric Wong2006-12-092-2/+57
* | | Merge branch 'np/addcommit'Junio C Hamano2006-12-136-122/+230
|\ \ \
| * | | git-commit: allow --only to lose what was staged earlier.Junio C Hamano2006-12-101-11/+1
| * | | Documentation/git-commit: rewrite to make it more end-user friendly.Junio C Hamano2006-12-091-76/+157
| * | | make 'git add' a first class user friendly interface to the indexNicolas Pitre2006-12-044-35/+72
* | | | Merge branch 'lh/branch-rename'Junio C Hamano2006-12-135-26/+257
|\ \ \ \
| * | | | git-branch: let caller specify logmsgLars Hjemli2006-12-053-10/+10
| * | | | rename_ref: use lstat(2) when testing for symlinkLars Hjemli2006-12-052-1/+8
| * | | | git-branch: add options and tests for branch renamingLars Hjemli2006-12-055-26/+250
| | |_|/ | |/| |
* | | | Merge branch 'jc/commit-careful'Junio C Hamano2006-12-132-0/+4
|\ \ \ \
| * | | | git-commit: show --summary after successful commit.Junio C Hamano2006-11-252-0/+4
* | | | | Merge branch 'ap/clone-origin'Junio C Hamano2006-12-131-1/+3
|\ \ \ \ \
| * | | | | Explicitly add the default "git pull" behaviour to .git/config on cloneAndy Parkins2006-12-061-1/+3
* | | | | | Merge branch 'jc/numstat'Junio C Hamano2006-12-131-1/+4
|\ \ \ \ \ \
| * | | | | | diff --numstat: show binary with '-' to match "apply --numstat"Junio C Hamano2006-12-111-1/+4
* | | | | | | Merge branch 'rr/cvsexportcommit'Junio C Hamano2006-12-132-166/+145
|\ \ \ \ \ \ \
| * | | | | | | Make cvsexportcommit work with filenames with spaces and non-ascii characters.Robin Rosenberg2006-12-112-166/+145
| |/ / / / / /
* | | | | | | Merge branch 'ap/branch'Junio C Hamano2006-12-131-5/+87
|\ \ \ \ \ \ \
| * | | | | | | branch --color: change default color selection.Junio C Hamano2006-12-131-2/+2
| * | | | | | | Colourise git-branch outputAndy Parkins2006-12-121-5/+87
| |/ / / / / /
* | | | | | | Merge branch 'js/merge'Junio C Hamano2006-12-1319-179/+715
|\ \ \ \ \ \ \
| * | | | | | | merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-122-30/+26
| * | | | | | | Merge branch 'master' into js/mergeJunio C Hamano2006-12-1231-363/+675
| |\ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | | | send-pack: tighten checks for remote namesJunio C Hamano2006-12-132-1/+22
* | | | | | | | | git-push: accept tag <tag> as advertised.Junio C Hamano2006-12-131-5/+30
* | | | | | | | | spurious .sp in manpagesJunio C Hamano2006-12-131-0/+14
* | | | | | | | | git merge: reword failure message.Junio C Hamano2006-12-131-1/+8
* | | | | | | | | Remove uncontested renamed files during merge.Shawn Pearce2006-12-132-1/+98
* | | | | | | | | Merge branch 'maint'Junio C Hamano2006-12-130-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-svn: correctly display fatal() error messagesEric Wong2006-12-131-1/+1
| * | | | | | | | | git-svn: exit with status 1 for test failuresEric Wong2006-12-131-8/+12
* | | | | | | | | | Allow subcommand.color and color.subcommand color configurationAndy Parkins2006-12-136-12/+15
* | | | | | | | | | git-push: document removal of remote ref with :<dst> pathspecJunio C Hamano2006-12-131-6/+9
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | git-svn: correctly handle packed-refs in refs/remotes/Eric Wong2006-12-121-1/+9