summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2006-12-23Use extended SHA1 syntax in merge-recursive conflicts.Shawn O. Pearce1-2/+2
2006-12-23gitweb: Allow search to be disabled from the config file.Robert Fitzsimons1-0/+13
2006-12-23gitweb: Require a minimum of two character for the search text.Robert Fitzsimons1-0/+3
2006-12-23gitweb: Use rev-list pattern search options.Robert Fitzsimons1-10/+10
2006-12-23checkout: make the message about the need for a new branch a bit clearerNicolas Pitre1-2/+5
2006-12-23gitweb: optimize git_summary.Robert Fitzsimons1-3/+3
2006-12-23gitweb: optimize git_shortlog_body.Robert Fitzsimons1-1/+3
2006-12-23gitweb: optimize git_get_last_activity.Robert Fitzsimons1-1/+2
2006-12-23gitweb: Add missing show '...' links change.Robert Fitzsimons1-0/+1
2006-12-23Make git-show-branch options similar to git-branch.Brian Gernhardt2-18/+32
2006-12-23Keep "git --git-dir" from causing a bus error.Brian Gernhardt1-2/+4
2006-12-23git-svn: enable common fetch/commit options for dcommitEric Wong1-1/+1
2006-12-23vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.Alexandre Julliard1-2/+3
2006-12-23Remove NO_ACCURATE_DIFF options from build systemsEric Wong2-9/+0
2006-12-23git-tag: lose exit after dieJunio C Hamano1-2/+0
2006-12-23Really fix headers for __FreeBSD__Junio C Hamano1-1/+1
2006-12-23Do not support "partial URL shorthand" anymore.Junio C Hamano1-27/+7
2006-12-23default pull: forget about "newbie protection" for now.Junio C Hamano1-7/+0
2006-12-23merge and reset: adjust for "reset --hard" messagesJunio C Hamano2-1/+2
2006-12-22commit-tree: do not overflow MAXPARENTJunio C Hamano1-0/+3
2006-12-22Introduce a global level warn() function.Shawn O. Pearce2-0/+21
2006-12-22Rename imap-send's internal info/warn functions.Shawn O. Pearce1-12/+12
2006-12-22_XOPEN_SOURCE problem also exists on FreeBSDJunio C Hamano1-1/+1
2006-12-22parse-remote: mark all refs not for merge only when fetching more than oneJunio C Hamano1-2/+9
2006-12-22git-reset --hard: tell the user what the HEAD was reset toJohannes Schindelin1-1/+6
2006-12-22git-tag: support -F <file> optionJohannes Schindelin2-1/+16
2006-12-22Revert "git-pull: refuse default merge without branch.*.merge"Junio C Hamano1-2/+1
2006-12-22Suggest 'add' in am/revert/cherry-pick.Shawn O. Pearce2-3/+3
2006-12-22Use git-merge-file in git-merge-one-file, tooJohannes Schindelin1-1/+1
2006-12-22diff --check: fix off by one errorJohannes Schindelin1-2/+2
2006-12-21Documentation/git-branch: new -r to delete remote-tracking branches.Quy Tonthat1-5/+8
2006-12-21Fix system header problems on Mac OS XTerje Sten Bjerkseth1-0/+2
2006-12-20diff documentation: mostly talk about <commit>Junio C Hamano1-2/+2
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-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-20gitweb: Show '...' links in "summary" view only if there are more itemsRobert Fitzsimons1-2/+9
2006-12-20config_rename_section: fix FILE* leakJunio C Hamano1-6/+13
2006-12-20Remove COLLISION_CHECK from Makefile since it's not used.Brian Gernhardt2-8/+0
2006-12-20fix populate-filespecJunio C Hamano1-1/+1
2006-12-20git-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-19Introduce GIT_TEMPLATE_DIRJohannes Schindelin2-3/+7
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 12:15:57 +0100