summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/skip-count'Junio C Hamano2006-12-254-14/+89
|\
| * revision: --skip=<n>Junio C Hamano2006-12-204-14/+89
* | Merge branch 'jc/git-add--interactive'Junio C Hamano2006-12-255-2/+940
|\ \
| * | git-add --interactive: add documentationJunio C Hamano2006-12-252-2/+119
| * | git-add --interactive: hunk splittingJunio C Hamano2006-12-181-8/+242
| * | git-add --interactiveJunio C Hamano2006-12-184-0/+587
* | | Merge branch 'sb/merge-friendly'Junio C Hamano2006-12-243-6/+23
|\ \ \
| * | | Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-233-4/+21
| * | | Use extended SHA1 syntax in merge-recursive conflicts.Shawn O. Pearce2006-12-231-2/+2
* | | | Merge branch 'js/rerere'Junio C Hamano2006-12-248-19/+585
|\ \ \ \
| * | | | Make git-rerere a builtinJohannes Schindelin2006-12-214-1/+409
| * | | | Add a test for git-rerereJohannes Schindelin2006-12-211-0/+154
| * | | | move read_mmfile() into xdiff-interfaceJohannes Schindelin2006-12-213-18/+22
* | | | | commit-tree: encourage UTF-8 commit messages.Johannes Schindelin2006-12-244-4/+303
* | | | | Switch git_mmap to use pread.Shawn O. Pearce2006-12-241-14/+5
* | | | | Rename gitfakemmap to git_mmap.Shawn O. Pearce2006-12-242-7/+7
* | | | | gitweb: Paginate commit/author/committer search outputRobert Fitzsimons2006-12-231-45/+103
* | | | | Makefile: add quick-install-doc for installing pre-built manpagesEric Wong2006-12-233-0/+37
| |/ / / |/| | |
* | | | gitweb: Allow search to be disabled from the config file.Robert Fitzsimons2006-12-221-0/+13
* | | | gitweb: Require a minimum of two character for the search text.Robert Fitzsimons2006-12-221-0/+3
* | | | gitweb: Use rev-list pattern search options.Robert Fitzsimons2006-12-221-10/+10
* | | | checkout: make the message about the need for a new branch a bit clearerNicolas Pitre2006-12-221-2/+5
* | | | gitweb: optimize git_summary.Robert Fitzsimons2006-12-221-3/+3
* | | | gitweb: optimize git_shortlog_body.Robert Fitzsimons2006-12-221-1/+3
* | | | gitweb: optimize git_get_last_activity.Robert Fitzsimons2006-12-221-1/+2
* | | | gitweb: Add missing show '...' links change.Robert Fitzsimons2006-12-221-0/+1
* | | | Make git-show-branch options similar to git-branch.Brian Gernhardt2006-12-222-18/+32
* | | | Keep "git --git-dir" from causing a bus error.Brian Gernhardt2006-12-221-2/+4
* | | | git-svn: enable common fetch/commit options for dcommitEric Wong2006-12-221-1/+1
* | | | vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.Alexandre Julliard2006-12-221-2/+3
* | | | Remove NO_ACCURATE_DIFF options from build systemsEric Wong2006-12-222-9/+0
* | | | git-tag: lose exit after dieJunio C Hamano2006-12-221-2/+0
* | | | Really fix headers for __FreeBSD__Junio C Hamano2006-12-221-1/+1
* | | | Do not support "partial URL shorthand" anymore.Junio C Hamano2006-12-221-27/+7
* | | | default pull: forget about "newbie protection" for now.Junio C Hamano2006-12-221-7/+0
* | | | merge and reset: adjust for "reset --hard" messagesJunio C Hamano2006-12-222-1/+2
* | | | commit-tree: do not overflow MAXPARENTJunio C Hamano2006-12-211-0/+3
|/ / /
* | | Introduce a global level warn() function.Shawn O. Pearce2006-12-212-0/+21
* | | Rename imap-send's internal info/warn functions.Shawn O. Pearce2006-12-211-12/+12
* | | _XOPEN_SOURCE problem also exists on FreeBSDJunio C Hamano2006-12-211-1/+1
* | | parse-remote: mark all refs not for merge only when fetching more than oneJunio C Hamano2006-12-211-2/+9
* | | Merge branch 'maint'Junio C Hamano2006-12-211-2/+2
|\ \ \
| * | | diff --check: fix off by one errorJohannes Schindelin2006-12-211-2/+2
| * | | spurious .sp in manpagesJunio C Hamano2006-12-201-0/+14
* | | | git-reset --hard: tell the user what the HEAD was reset toJohannes Schindelin2006-12-211-1/+6
* | | | git-tag: support -F <file> optionJohannes Schindelin2006-12-212-1/+16
* | | | Revert "git-pull: refuse default merge without branch.*.merge"Junio C Hamano2006-12-211-2/+1
* | | | Suggest 'add' in am/revert/cherry-pick.Shawn O. Pearce2006-12-212-3/+3
* | | | Use git-merge-file in git-merge-one-file, tooJohannes Schindelin2006-12-211-1/+1
* | | | Documentation/git-branch: new -r to delete remote-tracking branches.Quy Tonthat2006-12-201-5/+8