summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix read_mailmap to handle a caller uninterested in repo abbreviationAlex Riesen2007-04-301-0/+3
* Use strlcpy instead of strncpy in mailmap.cAlex Riesen2007-04-301-1/+1
* Merge branch 'jc/attr'Junio C Hamano2007-04-293-12/+531
|\
| * Add 'filter' attribute and external filter driver definition.Junio C Hamano2007-04-243-3/+282
| * Add 'ident' conversion.Junio C Hamano2007-04-243-12/+252
* | Make sure test-genrandom and test-chmtime are builtas part of the main build.Junio C Hamano2007-04-291-1/+5
* | Make macros to prevent double-inclusion in headers consistent.Junio C Hamano2007-04-294-10/+10
* | Apply mailmap in git-blame output.Junio C Hamano2007-04-291-3/+39
* | Split out mailmap handling out of shortlogJunio C Hamano2007-04-294-82/+101
* | blame -s: suppress author name and time.Junio C Hamano2007-04-292-6/+18
* | Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAILJosh Triplett2007-04-295-2/+7
* | Merge commit 'gfi/master'Junio C Hamano2007-04-290-0/+0
|\ \
| * \ Merge branch 'gfi-maint' into gfi-masterShawn O. Pearce2007-04-282-0/+3
| |\ \
* | \ \ Merge branch 'maint'Junio C Hamano2007-04-2911-8/+47
|\ \ \ \ | |/ / / |/| | |
| * | | http.c: Fix problem with repeated calls of http_initJulian Phillips2007-04-291-0/+1
| * | | Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentationJosh Triplett2007-04-292-0/+2
| * | | Fix import-tars fix.Junio C Hamano2007-04-291-1/+1
| * | | Update .mailmap with "Michael"Junio C Hamano2007-04-291-0/+1
| * | | Do not barf on too long action descriptionJunio C Hamano2007-04-291-4/+1
| * | | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintJunio C Hamano2007-04-282-0/+3
| |\ \ \ | | |/ /
| | * | Merge commit 'jc/maint' into gfi-maintShawn O. Pearce2007-04-2831-71/+268
| | |\ \
| | * | | Don't allow empty pathnames in fast-importShawn O. Pearce2007-04-281-0/+2
| | * | | import-tars: be nice to wrong directory modesJohannes Schindelin2007-04-281-0/+1
| * | | | Catch empty pathnames in trees during fsckShawn O. Pearce2007-04-281-0/+6
| * | | | git-svn: Added 'find-rev' commandAdam Roben2007-04-272-0/+29
| * | | | git shortlog documentation: add long options and fix a typoMichele Ballabio2007-04-271-4/+4
| | |/ / | |/| |
* | | | Merge branch 'maint'Junio C Hamano2007-04-269-17/+105
|\ \ \ \ | |/ / /
| * | | Update git-http-fetch documentationAndrew Ruder2007-04-261-0/+4
| * | | Update git-local-fetch documentationAndrew Ruder2007-04-261-0/+14
| * | | Update git-http-push documentationAndrew Ruder2007-04-261-2/+11
| * | | Update -L documentation for git-blame/git-annotateAndrew Ruder2007-04-261-2/+22
| * | | Update git-grep documentationAndrew Ruder2007-04-261-4/+15
| * | | Update git-fmt-merge documentationAndrew Ruder2007-04-261-1/+24
| * | | Document additional options for git-fetchAndrew Ruder2007-04-261-5/+12
| * | | Removing -n option from git-diff-files documentationAndrew Ruder2007-04-262-3/+3
* | | | post-receive-email example hook: sed command for getting description was wrongAndy Parkins2007-04-261-1/+1
* | | | post-receive-email example hook: detect rewind-only updates and output sensib...Andy Parkins2007-04-261-23/+54
* | | | post-receive-email example hook: fastforward should have been fast_forwardAndy Parkins2007-04-261-1/+1
* | | | Ignore merged status of the file-level mergeAlex Riesen2007-04-261-1/+1
* | | | Add a test for merging changed and rename-changed branchesAlex Riesen2007-04-252-0/+28
* | | | Avoid excessive rewrites in merge-recursiveAlex Riesen2007-04-251-13/+19
* | | | Merge branch 'maint'Junio C Hamano2007-04-257-33/+111
|\ \ \ \ | |/ / /
| * | | Start preparing for 1.5.1.3Junio C Hamano2007-04-252-1/+39
| * | | Sanitize @to recipients.Robin H. Johnson2007-04-251-0/+1
| * | | git-svn: Ignore usernames in URLs in find_by_urlAdam Roben2007-04-251-0/+4
| * | | Document --dry-run and envelope-sender for git-send-email.Robin H. Johnson2007-04-251-0/+9
| * | | Allow users to optionally specify their envelope sender.Robin H. Johnson2007-04-251-1/+9
| * | | Ensure clean addresses are always used with Net::SMTPRobin H. Johnson2007-04-251-4/+5
| * | | Validate @recipients before using it for sendmail and Net::SMTP.Robin H. Johnson2007-04-251-1/+2
| * | | Perform correct quoting of recipient names.Robin H. Johnson2007-04-251-5/+14