summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2006-12-25GIT v1.5.0 previewv1.5.0-rc0Junio C Hamano1-1/+1
2006-12-25Merge branch 'jc/bm'Junio C Hamano1-2/+6
2006-12-25Merge branch 'rf/web'Junio C Hamano1-96/+107
2006-12-25git-add -f: allow adding otherwise ignored files.Junio C Hamano2-7/+35
2006-12-25gitweb: Use rev-list --skip option.Robert Fitzsimons1-23/+1
2006-12-25gitweb: Change history action to use parse_commits.Robert Fitzsimons1-18/+9
2006-12-25gitweb: Change atom, rss actions to use parse_commits.Robert Fitzsimons1-11/+7
2006-12-25gitweb: Change header search action to use parse_commits.Robert Fitzsimons1-14/+9
2006-12-25gitweb: Change log action to use parse_commits.Robert Fitzsimons1-11/+14
2006-12-25gitweb: Change summary, shortlog actions to use parse_commits.Robert Fitzsimons1-22/+12
2006-12-25gitweb: We do longer need the --parents flag in rev-list.Robert Fitzsimons1-5/+6
2006-12-25gitweb: Add parse_commits, used to bulk load commit objects.Robert Fitzsimons1-17/+74
2006-12-25git-add: warn when adding an ignored file with an explicit request.Junio C Hamano1-0/+3
2006-12-25git-add: add ignored files when asked explicitly.Junio C Hamano2-4/+18
2006-12-25read_directory: show_both option.Junio C Hamano2-9/+16
2006-12-25git-rm: DocumentationJunio C Hamano1-24/+27
2006-12-25t3600: update the test for updated git rmJunio C Hamano1-4/+74
2006-12-25git-rm: update to saner semanticsJunio C Hamano1-20/+103
2006-12-25match_pathspec() -- return how well the spec matchedJunio C Hamano2-16/+39
2006-12-25Merge branch 'jc/skip-count'Junio C Hamano4-14/+89
2006-12-25Merge branch 'jc/git-add--interactive'Junio C Hamano5-2/+940
2006-12-25git-add --interactive: add documentationJunio C Hamano2-2/+119
2006-12-24Allow branch.*.merge to talk about remote tracking branches.Junio C Hamano1-2/+6
2006-12-24Merge branch 'sb/merge-friendly'Junio C Hamano3-6/+23
2006-12-24Merge branch 'js/rerere'Junio C Hamano8-19/+585
2006-12-24commit-tree: encourage UTF-8 commit messages.Johannes Schindelin4-4/+303
2006-12-24Switch git_mmap to use pread.Shawn O. Pearce1-14/+5
2006-12-24Rename gitfakemmap to git_mmap.Shawn O. Pearce2-7/+7
2006-12-23gitweb: Paginate commit/author/committer search outputRobert Fitzsimons1-45/+103
2006-12-23Makefile: add quick-install-doc for installing pre-built manpagesEric Wong3-0/+37
2006-12-23Display 'theirs' branch name when possible in merge.Shawn O. Pearce3-4/+21
2006-12-23Use extended SHA1 syntax in merge-recursive conflicts.Shawn O. Pearce1-2/+2
2006-12-22gitweb: Allow search to be disabled from the config file.Robert Fitzsimons1-0/+13
2006-12-22gitweb: Require a minimum of two character for the search text.Robert Fitzsimons1-0/+3
2006-12-22gitweb: Use rev-list pattern search options.Robert Fitzsimons1-10/+10
2006-12-22checkout: make the message about the need for a new branch a bit clearerNicolas Pitre1-2/+5
2006-12-22gitweb: optimize git_summary.Robert Fitzsimons1-3/+3
2006-12-22gitweb: optimize git_shortlog_body.Robert Fitzsimons1-1/+3
2006-12-22gitweb: optimize git_get_last_activity.Robert Fitzsimons1-1/+2
2006-12-22gitweb: Add missing show '...' links change.Robert Fitzsimons1-0/+1
2006-12-22Make git-show-branch options similar to git-branch.Brian Gernhardt2-18/+32
2006-12-22Keep "git --git-dir" from causing a bus error.Brian Gernhardt1-2/+4
2006-12-22git-svn: enable common fetch/commit options for dcommitEric Wong1-1/+1
2006-12-22vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.Alexandre Julliard1-2/+3
2006-12-22Remove NO_ACCURATE_DIFF options from build systemsEric Wong2-9/+0
2006-12-22git-tag: lose exit after dieJunio C Hamano1-2/+0
2006-12-22Really fix headers for __FreeBSD__Junio C Hamano1-1/+1
2006-12-22Do not support "partial URL shorthand" anymore.Junio C Hamano1-27/+7
2006-12-22default pull: forget about "newbie protection" for now.Junio C Hamano1-7/+0
2006-12-22merge and reset: adjust for "reset --hard" messagesJunio C Hamano2-1/+2
2006-12-21commit-tree: do not overflow MAXPARENTJunio C Hamano1-0/+3
2006-12-21Make git-rerere a builtinJohannes Schindelin4-1/+409
2006-12-21Add a test for git-rerereJohannes Schindelin1-0/+154
2006-12-21move read_mmfile() into xdiff-interfaceJohannes Schindelin3-18/+22
2006-12-21Introduce a global level warn() function.Shawn O. Pearce2-0/+21
2006-12-21Rename imap-send's internal info/warn functions.Shawn O. Pearce1-12/+12
2006-12-21_XOPEN_SOURCE problem also exists on FreeBSDJunio C Hamano1-1/+1
2006-12-21parse-remote: mark all refs not for merge only when fetching more than oneJunio C Hamano1-2/+9
2006-12-21Merge branch 'maint'Junio C Hamano1-2/+2
2006-12-21git-reset --hard: tell the user what the HEAD was reset toJohannes Schindelin1-1/+6
2006-12-21git-tag: support -F <file> optionJohannes Schindelin2-1/+16
2006-12-21Revert "git-pull: refuse default merge without branch.*.merge"Junio C Hamano1-2/+1
2006-12-21Suggest 'add' in am/revert/cherry-pick.Shawn O. Pearce2-3/+3
2006-12-21Use git-merge-file in git-merge-one-file, tooJohannes Schindelin1-1/+1
2006-12-21diff --check: fix off by one errorJohannes Schindelin1-2/+2
2006-12-20Documentation/git-branch: new -r to delete remote-tracking branches.Quy Tonthat1-5/+8
2006-12-20Fix system header problems on Mac OS XTerje Sten Bjerkseth1-0/+2
2006-12-20Merge branch 'ew/svn-pm'Junio C Hamano10-1087/+198
2006-12-20diff documentation: mostly talk about <commit>Junio C Hamano1-2/+2
2006-12-20Merge branch 'jc/leftright'Junio C Hamano5-10/+43
2006-12-20Merge branch 'jc/blame'Junio C Hamano1-2/+31
2006-12-20Merge branch 'jc/branch-remove-remote'Junio C Hamano1-26/+62
2006-12-20Merge branch 'jc/clone'Junio C Hamano13-85/+52
2006-12-20compat/inet_ntop: do not use u_intJunio C Hamano1-1/+1
2006-12-20spurious .sp in manpagesJunio C Hamano1-0/+14
2006-12-20git-add: error out when given no arguments.Junio C Hamano1-0/+5
2006-12-20revision: --skip=<n>Junio C Hamano4-14/+89
2006-12-20Merge branch 'maint'Junio C Hamano1-1/+1
2006-12-20GIT 1.4.4.3v1.4.4.3Junio C Hamano1-1/+1
2006-12-20clarify some error messages wrt unknown object typesNicolas Pitre2-3/+3
2006-12-20simplify inclusion of system header files.Junio C Hamano72-201/+42
2006-12-20index-pack usage of mmap() is unacceptably slower on many OSes other than LinuxNicolas Pitre1-13/+14
2006-12-19gitweb: Show '...' links in "summary" view only if there are more itemsRobert Fitzsimons1-2/+9
2006-12-19config_rename_section: fix FILE* leakJunio C Hamano1-6/+13
2006-12-19Remove COLLISION_CHECK from Makefile since it's not used.Brian Gernhardt2-8/+0
2006-12-19fix populate-filespecJunio C Hamano1-1/+1
2006-12-19git-cvsserver: fix breakage when calling git merge-fileEric Wong1-1/+1
2006-12-19Revert "Make left-right automatic."Junio C Hamano2-11/+3
2006-12-19Move "no merge candidate" warning into git-pullJosef Weidendorfer2-10/+4
2006-12-19Use preprocessor constants for environment variable names.Junio C Hamano6-12/+16
2006-12-19Do not create $GIT_DIR/remotes/ directory anymore.Junio C Hamano2-5/+3
2006-12-19Merge branch 'jc/test-clone' into jc/cloneJunio C Hamano29-106/+564
2006-12-19Introduce GIT_TEMPLATE_DIRJohannes Schindelin2-3/+7
2006-12-19Revert "fix testsuite: make sure they use templates freshly built from the so...Junio C Hamano11-36/+26
2006-12-18git-add --interactive: hunk splittingJunio C Hamano1-8/+242
2006-12-18git-add --interactiveJunio C Hamano4-0/+587
2006-12-18blame: -b (blame.blankboundary) and --root (blame.showroot)Junio C Hamano1-2/+31
2006-12-18git-branch -d: do not stop at the first failure.Quy Tonthat1-18/+39
2006-12-18Teach git-branch to delete tracking branches with -r -dJunio C Hamano1-13/+28
2006-12-18fix testsuite: make sure they use templates freshly built from the sourceJunio C Hamano11-26/+36
2006-12-18rerere: fix breakage of resolving.Junio C Hamano1-1/+1
2006-12-18Add config example with respect to branchAneesh Kumar K.V1-0/+5
2006-12-18Add documentation for show-branch --topicsBrian Gernhardt1-1/+9
2006-12-18make git a bit less cryptic on fetch errorsNicolas Pitre3-3/+3
2006-12-18make patch_delta() error cases a bit more verboseNicolas Pitre2-9/+8
2006-12-18racy-git: documentation updates.Junio C Hamano1-18/+20
2006-12-18show-ref: fix --exclude-existingJunio C Hamano1-3/+4
2006-12-18parse-remote::expand_refs_wildcard()Junio C Hamano1-5/+3
2006-12-18vim syntax: follow recent changes to commit templateJeff King1-2/+2
2006-12-17show-ref: fix --verify --hash=lengthJunio C Hamano1-10/+15
2006-12-17show-ref: fix --quiet --verifyJunio C Hamano1-3/+5
2006-12-17Merge branch 'jc/blame-boundary'Junio C Hamano1-1/+14
2006-12-17Merge branch 'jc/reflog' (early part)Junio C Hamano1-5/+30
2006-12-17Merge branch 'js/branch-config'Junio C Hamano6-1/+142
2006-12-17Merge branch 'jn/web' (early part)Junio C Hamano1-33/+183
2006-12-17avoid accessing _all_ loose refs in git-show-ref --verifyJunio C Hamano1-0/+17
2006-12-17git-fetch: Avoid reading packed refs over and over againJunio C Hamano2-10/+62
2006-12-17Teach show-branch how to show ref-log data.Junio C Hamano1-5/+30
2006-12-17Make left-right automatic.Junio C Hamano2-3/+11
2006-12-17Teach all of log family --left-right output.Junio C Hamano4-10/+28
2006-12-17rev-list --left-rightJunio C Hamano4-6/+21
2006-12-17markup fix in svnimport documentation.Junio C Hamano1-8/+8
2006-12-17Documentation: new option -P for git-svnimportQuy Tonthat1-0/+9
2006-12-17Fix mis-mark-up in git-merge-file.txt documentationJunio C Hamano1-2/+2
2006-12-17Default GIT_COMMITTER_NAME to login name in recieve-pack.Shawn O. Pearce3-0/+18
2006-12-17Fix check_file_directory_conflict().Junio C Hamano2-1/+10
2006-12-17git-add: remove conflicting entry when adding.Junio C Hamano1-1/+1
2006-12-17update-index: make D/F conflict error a bit more verbose.Junio C Hamano1-1/+1
2006-12-16git-branch: rename config vars branch.<branch>.*, tooJohannes Schindelin2-0/+16
2006-12-16add a function to rename sections in the configJohannes Schindelin4-1/+126
2006-12-16git-clone: lose the traditional 'no-separate-remote' layoutJunio C Hamano2-60/+13
2006-12-16git-clone: lose the artificial "first" fetch refspecJunio C Hamano1-4/+4
2006-12-16git-pull: refuse default merge without branch.*.mergeJunio C Hamano1-1/+2
2006-12-16git-clone: use wildcard specification for tracking branchesJunio C Hamano1-17/+30
2006-12-16merge: give a bit prettier merge message to "merge branch~$n"Junio C Hamano1-9/+17
2006-12-16gitweb: Add "next" link to commit viewJakub Narebski1-9/+29
2006-12-16gitweb: Add title attribute to ref marker with full ref nameJakub Narebski1-1/+2
2006-12-16gitweb: Do not show difftree for merges in "commit" viewJakub Narebski1-7/+15
2006-12-16git-svn: rename 'commit' command to 'set-tree'Eric Wong5-29/+29
2006-12-16git-svn: remove support for the svn command-line clientEric Wong7-882/+51
2006-12-16Document git-merge-fileJohannes Schindelin2-0/+95
2006-12-15git-clone documentationQuy Tonthat1-1/+1
2006-12-15git-status always says what branch it's onAndy Parkins1-1/+1
2006-12-15git-svn: convert to using Git.pmEric Wong1-193/+135
2006-12-15Align section headers of 'git status' to new 'git add'.Shawn O. Pearce4-12/+13
2006-12-15Suggest use of "git add file1 file2" when there is nothing to commit.Shawn O. Pearce2-6/+7
2006-12-15Make git-diff documentation use [--] when it should.Brian Gernhardt1-3/+3
2006-12-15Add --add option to git-repo-configBrian Gernhardt3-3/+27
2006-12-15Teach bash the new features of 'git show'.Shawn O. Pearce1-3/+21
2006-12-15Export PERL_PATHLuben Tuikov1-0/+2
2006-12-15Enable reflogs by default in any repository with a working directory.Shawn O. Pearce5-4/+21
2006-12-15Provide more meaningful output from 'git init-db'.Shawn O. Pearce4-10/+17
2006-12-15make commit message a little more consistent and confortingNicolas Pitre9-29/+84
2006-12-15Avoid accessing a slow working copy during diffcore operations.Shawn O. Pearce2-3/+28
2006-12-15Merge branch 'js/show'Junio C Hamano3-9/+115
2006-12-14git-show: grok blobs, trees and tags, tooJohannes Schindelin3-9/+115
2006-12-14git-reset [--mixed] <tree> [--] <paths>...Junio C Hamano1-22/+47
2006-12-14git-reset: make it work from within a subdirectory.Junio C Hamano1-0/+7
2006-12-14git-fetch: make it work from within a subdirectory.Junio C Hamano1-0/+6
2006-12-14INSTALL: no need to have GNU diff installedJohannes Schindelin1-10/+0
2006-12-14Merge branch 'maint'Junio C Hamano1-0/+2
2006-12-14Bypass expensive content comparsion during rename detection.Shawn O. Pearce1-0/+2
2006-12-14Update git-diff documentationJunio C Hamano1-17/+35
2006-12-13Merge branch 'jc/diff--cached'Junio C Hamano2-5/+3
2006-12-13git-svn: allow both diff.color and color.diffJunio C Hamano1-6/+25
2006-12-13repacked packs should be read-onlyNicolas Pitre1-0/+2
2006-12-13config documentation: group color items together.Junio C Hamano1-18/+18
2006-12-13git-svn: correctly handle "(no author)" when using an authors fileEric Wong1-1/+2
2006-12-13git-blame: show lines attributed to boundary commits differently.Junio C Hamano1-1/+14
2006-12-13Merge branch 'jc/read-tree-ignore'Junio C Hamano9-20/+139
2006-12-13Merge branch 'ew/rerere'Junio C Hamano4-2/+106
2006-12-13Merge branch 'np/addcommit'Junio C Hamano6-122/+230
2006-12-13Merge branch 'lh/branch-rename'Junio C Hamano5-26/+257
2006-12-13Merge branch 'jc/commit-careful'Junio C Hamano2-0/+4
2006-12-13Merge branch 'ap/clone-origin'Junio C Hamano1-1/+3
2006-12-13Merge branch 'jc/numstat'Junio C Hamano1-1/+4
2006-12-13Merge branch 'rr/cvsexportcommit'Junio C Hamano2-166/+145
2006-12-13Merge branch 'ap/branch'Junio C Hamano1-5/+87
2006-12-13branch --color: change default color selection.Junio C Hamano1-2/+2
2006-12-13Merge branch 'js/merge'Junio C Hamano19-179/+715
2006-12-13send-pack: tighten checks for remote namesJunio C Hamano2-1/+22
2006-12-13git-push: accept tag <tag> as advertised.Junio C Hamano1-5/+30
2006-12-13spurious .sp in manpagesJunio C Hamano1-0/+14
2006-12-13git merge: reword failure message.Junio C Hamano1-1/+8
2006-12-13Remove uncontested renamed files during merge.Shawn Pearce2-1/+98
2006-12-13Revert "git-diff: Introduce --index and deprecate --cached."Junio C Hamano2-5/+3
2006-12-13Merge branch 'maint'Junio C Hamano0-0/+0
2006-12-13git-svn: correctly display fatal() error messagesEric Wong1-1/+1
2006-12-13git-svn: exit with status 1 for test failuresEric Wong1-8/+12
2006-12-13Allow subcommand.color and color.subcommand color configurationAndy Parkins6-12/+15
2006-12-13git-push: document removal of remote ref with :<dst> pathspecJunio C Hamano1-6/+9
2006-12-12merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2-30/+26
2006-12-12Merge branch 'master' into js/mergeJunio C Hamano31-363/+675
2006-12-12Get rid of the dependency on RCS' merge programJohannes Schindelin8-89/+20
2006-12-12git-svn: correctly handle packed-refs in refs/remotes/Eric Wong1-1/+9
2006-12-12Merge branch 'maint'Junio C Hamano2-19/+23
2006-12-12add test case for recursive mergeJunio C Hamano1-0/+70
2006-12-12git-svn: correctly display fatal() error messagesEric Wong1-1/+1
2006-12-12git-svn: allow dcommit to take an alternate headEric Wong2-7/+10
2006-12-12git-svn: enable logging of information not supported by gitEric Wong1-18/+184