summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs.c: drop curate_packed_refsjk/prune-with-corrupt-refsJeff King2015-03-202-67/+2
* repack: turn on "ref paranoia" when doing a destructive repackJeff King2015-03-202-3/+7
* prune: turn on ref_paranoia flagJeff King2015-03-202-2/+3
* refs: introduce a "ref paranoia" flagJeff King2015-03-204-0/+25
* t5312: test object deletion code paths in a corrupted repositoryJeff King2015-03-201-0/+114
* Git 2.3.3v2.3.3Junio C Hamano2015-03-134-3/+43
* Merge branch 'mr/doc-clean-f-f' into maintJunio C Hamano2015-03-131-2/+6
|\
| * Documentation/git-clean.txt: document that -f may need to be given twicemr/doc-clean-f-fMikko Rapeli2015-02-261-2/+6
* | Merge branch 'ak/t5516-typofix' into maintJunio C Hamano2015-03-131-1/+1
|\ \
| * | t5516: correct misspelled pushInsteadOfak/t5516-typofixAnders Kaseorg2015-03-031-1/+1
| |/
* | Merge branch 'jc/diff-test-updates' into maintJunio C Hamano2015-03-1311-175/+550
|\ \
| * | test_ln_s_add: refresh stat info of fake symbolic linksjc/diff-test-updatesJohannes Sixt2015-02-231-1/+3
| * | t4008: modernise styleJunio C Hamano2015-02-151-160/+126
| * | t/diff-lib: check exact object names in compare_diff_rawJunio C Hamano2015-02-151-1/+1
| * | tests: do not borrow from COPYING and README from the real sourceJunio C Hamano2015-02-157-26/+433
| * | t4010: correct expected object namesJunio C Hamano2015-02-151-1/+1
| * | t9300: correct expected object namesJunio C Hamano2015-02-151-2/+2
| * | t4008: correct stale commentsJunio C Hamano2015-02-151-3/+3
* | | Merge branch 'jk/diffcore-rename-duplicate' into maintJunio C Hamano2015-03-132-13/+110
|\ \ \
| * | | diffcore-rename: avoid processing duplicate destinationsjk/diffcore-rename-duplicateJeff King2015-02-272-2/+85
| * | | diffcore-rename: split locate_rename_dst into two functionsJeff King2015-02-271-12/+26
| | |/ | |/|
* | | Merge branch 'bw/kwset-use-unsigned' into maintJunio C Hamano2015-03-134-7/+7
|\ \ \
| * | | kwset: use unsigned char to store values with high-bit setbw/kwset-use-unsignedBen Walton2015-03-024-7/+7
| |/ /
* | | Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano2015-03-131-1/+1
|\ \ \
| * | | grep: correct help string for --exclude-standardnd/grep-exclude-standard-help-fixNguyễn Thái Ngọc Duy2015-02-271-1/+1
| |/ /
* | | Merge branch 'mg/doc-remote-tags-or-not' into maintJunio C Hamano2015-03-131-0/+3
|\ \ \
| * | | git-remote.txt: describe behavior without --tags and --no-tagsmg/doc-remote-tags-or-notMichael J Gruber2015-03-021-0/+3
* | | | Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano2015-03-132-1/+15
|\ \ \ \
| * | | | diff --shortstat --dirstat: remove duplicate outputmk/diff-shortstat-dirstat-fixMårten Kongstad2015-03-022-1/+15
| | |/ / | |/| |
* | | | Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano2015-03-133-37/+64
|\ \ \ \
| * | | | submodule: improve documentation of update subcommandms/submodule-update-config-docMichal Sojka2015-03-023-37/+64
* | | | | Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-134-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
* | | | | | Merge branch 'rs/daemon-interpolate' into maintJunio C Hamano2015-03-131-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 'jk/daemon-interpolate' into maintJunio C Hamano2015-03-133-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
| |/ / / / / /
* | | | | | | Git 2.3.2v2.3.2Junio C Hamano2015-03-063-2/+14
* | | | | | | Merge branch 'rj/no-xopen-source-for-cygwin' into maintJunio C Hamano2015-03-061-6/+0
|\ \ \ \ \ \ \
| * | | | | | | git-compat-util.h: remove redundant coderj/no-xopen-source-for-cygwinRamsay Jones2015-02-221-6/+0
* | | | | | | | Merge branch 'rs/simple-cleanups' into maintJunio C Hamano2015-03-064-13/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
View Lorry Controller Status