summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_name: use strlcpy() to copy stringsrs/simple-cleanupsRené Scharfe2015-02-221-6/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: use starts_with() to check for a prefixRené Scharfe2015-02-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe2015-02-221-4/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | connect: use strcmp() for string comparisonRené Scharfe2015-02-221-2/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/no-xopen-source-for-cygwin'Junio C Hamano2015-03-051-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-compat-util.h: remove redundant coderj/no-xopen-source-for-cygwinRamsay Jones2015-02-221-6/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/am-c-doc'Junio C Hamano2015-03-052-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-am.txt: mention mailinfo.scissors config variablemm/am-c-docMatthieu Moy2015-02-201-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/config.txt: document mailinfo.scissorsMatthieu Moy2015-02-201-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/refs-have-new'Junio C Hamano2015-03-0514-106/+233
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs.h: remove duplication in function docstringsmh/refs-have-newMichael Haggerty2015-02-171-23/+43
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_ref(): improve documentationMichael Haggerty2015-02-172-7/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_verify(): new function to check a reference's valueMichael Haggerty2015-02-173-21/+67
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_delete(): check that old_sha1 is not null_sha1Michael Haggerty2015-02-171-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_create(): check that new_sha1 is validMichael Haggerty2015-02-171-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: avoid race when creating orphan commitsMichael Haggerty2015-02-172-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: add tests of commit racesMichael Haggerty2015-02-171-0/+30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_delete(): remove "have_old" parameterMichael Haggerty2015-02-174-12/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_update(): remove "have_old" parameterMichael Haggerty2015-02-1712-29/+31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | struct ref_update: move "have_old" into "flags"Michael Haggerty2015-02-171-17/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs.c: change some "flags" to "unsigned int"Michael Haggerty2015-02-174-16/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs: remove the gap in the REF_* constant valuesMichael Haggerty2015-02-121-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs: move REF_DELETING to refs.cMichael Haggerty2015-02-122-3/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #6)Junio C Hamano2015-03-031-0/+24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/daemon-interpolate'Junio C Hamano2015-03-033-6/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daemon: sanitize incoming virtual hostnamejk/daemon-interpolateJeff King2015-02-172-5/+56
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5570: test git-daemon's --interpolated-path optionJeff King2015-02-171-0/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_connect: let user override virtual-host we send to daemonJeff King2015-02-171-1/+11
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/daemon-interpolate'Junio C Hamano2015-03-031-15/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daemon: use callback to build interpolated pathrs/daemon-interpolateRené Scharfe2015-02-171-9/+45
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daemon: look up client-supplied hostname lazilyRené Scharfe2015-02-171-8/+29
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'km/send-email-getopt-long-workarounds'Junio C Hamano2015-03-032-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-send-email.perl: support no- prefix with older GetOptionskm/send-email-getopt-long-workaroundsKyle J. McKay2015-02-162-5/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-expands-report'Junio C Hamano2015-03-031-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: detect and mark whitespace errors in context lines when fixingjc/apply-ws-fix-expands-reportJunio C Hamano2015-01-221-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-034-2/+399
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: do not touch a file beyond a symbolic linkjc/apply-beyond-symlinkJunio C Hamano2015-02-103-4/+203
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-102-0/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: do not read from the filesystem under --indexJunio C Hamano2015-02-101-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-103-1/+178
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cyle (batch #5)Junio C Hamano2015-02-251-0/+53
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/git-pm-typofix'Junio C Hamano2015-02-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git.pm: two minor typo fixesak/git-pm-typofixAlexander Kuleshov2015-02-181-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/plug-leak-in-make-cache-entry'Junio C Hamano2015-02-251-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read-cache.c: free cache entry when refreshing failssb/plug-leak-in-make-cache-entryStefan Beller2015-02-171-2/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/transport-capabilities'Junio C Hamano2015-02-251-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transport-helper: ask the helper to set the same options for import as for fetchmh/transport-capabilitiesMike Hommey2015-02-131-10/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transport-helper: ask the helper to set progress and verbosity options after ...Mike Hommey2015-02-131-2/+3
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/send-email-sensible-encoding'Junio C Hamano2015-02-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: ask confirmation if given encoding name is very shortjc/send-email-sensible-encodingJunio C Hamano2015-02-131-0/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |