summaryrefslogtreecommitdiffstats
path: root/git-merge.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2007-05-01Use strlcpy instead of strncpy in mailmap.cAlex Riesen1-1/+1
2007-04-29Make sure test-genrandom and test-chmtime are builtas part of the main build.Junio C Hamano1-1/+5
2007-04-29Make macros to prevent double-inclusion in headers consistent.Junio C Hamano4-10/+10
2007-04-29Apply mailmap in git-blame output.Junio C Hamano1-3/+39
2007-04-29Split out mailmap handling out of shortlogJunio C Hamano4-82/+101
2007-04-29blame -s: suppress author name and time.Junio C Hamano2-6/+18
2007-04-29Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAILJosh Triplett5-2/+7
2007-04-29http.c: Fix problem with repeated calls of http_initJulian Phillips1-0/+1
2007-04-29Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentationJosh Triplett2-0/+2
2007-04-29Fix import-tars fix.Junio C Hamano1-1/+1
2007-04-29Update .mailmap with "Michael"Junio C Hamano1-0/+1
2007-04-29Do not barf on too long action descriptionJunio C Hamano1-4/+1
2007-04-29Catch empty pathnames in trees during fsckShawn O. Pearce1-0/+6
2007-04-29Don't allow empty pathnames in fast-importShawn O. Pearce1-0/+2
2007-04-29import-tars: be nice to wrong directory modesJohannes Schindelin1-0/+1
2007-04-28git-svn: Added 'find-rev' commandAdam Roben2-0/+29
2007-04-28git shortlog documentation: add long options and fix a typoMichele Ballabio1-4/+4
2007-04-27Update git-http-fetch documentationAndrew Ruder1-0/+4
2007-04-27Update git-local-fetch documentationAndrew Ruder1-0/+14
2007-04-27Update git-http-push documentationAndrew Ruder1-2/+11
2007-04-27Update -L documentation for git-blame/git-annotateAndrew Ruder1-2/+22
2007-04-27Update git-grep documentationAndrew Ruder1-4/+15
2007-04-27Update git-fmt-merge documentationAndrew Ruder1-1/+24
2007-04-27Document additional options for git-fetchAndrew Ruder1-5/+12
2007-04-27Removing -n option from git-diff-files documentationAndrew Ruder2-3/+3
2007-04-27post-receive-email example hook: sed command for getting description was wrongAndy Parkins1-1/+1
2007-04-27post-receive-email example hook: detect rewind-only updates and output sensib...Andy Parkins1-23/+54
2007-04-27post-receive-email example hook: fastforward should have been fast_forwardAndy Parkins1-1/+1
2007-04-27Ignore merged status of the file-level mergeAlex Riesen1-1/+1
2007-04-26Add a test for merging changed and rename-changed branchesAlex Riesen2-0/+28
2007-04-26Avoid excessive rewrites in merge-recursiveAlex Riesen1-13/+19
2007-04-26Start preparing for 1.5.1.3Junio C Hamano2-1/+39
2007-04-26Sanitize @to recipients.Robin H. Johnson1-0/+1
2007-04-26git-svn: Ignore usernames in URLs in find_by_urlAdam Roben1-0/+4
2007-04-26Add --date={local,relative,default}Junio C Hamano9-17/+71
2007-04-26Document --dry-run and envelope-sender for git-send-email.Robin H. Johnson1-0/+9
2007-04-26Allow users to optionally specify their envelope sender.Robin H. Johnson1-1/+9
2007-04-26Ensure clean addresses are always used with Net::SMTPRobin H. Johnson1-4/+5
2007-04-26Validate @recipients before using it for sendmail and Net::SMTP.Robin H. Johnson1-1/+2
2007-04-26Perform correct quoting of recipient names.Robin H. Johnson1-5/+14
2007-04-26Change the scope of the $cc variable as it is not needed outside of send_mess...Robin H. Johnson1-4/+3
2007-04-26Debugging cleanup improvementsRobin H. Johnson1-4/+6
2007-04-26Prefix Dry- to the message status to denote dry-runs.Robin H. Johnson1-2/+2
2007-04-26Document --dry-run parameter to send-email.Robin H. Johnson1-0/+2
2007-04-26git-svn: Don't rely on $_ after making a function callAdam Roben1-5/+5
2007-04-26Fix handle leak in write_treeAlex Riesen1-1/+5
2007-04-25Actually handle some-low memory conditionsShawn O. Pearce2-11/+11
2007-04-25init_buffer(): Kill buf pointerLuiz Fernando N. Capitulino1-2/+1
2007-04-25core-tutorial: minor fixesLuiz Fernando N. Capitulino1-5/+4
2007-04-25read_cache_from(): small simplificationLuiz Fernando N. Capitulino1-9/+8