summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'va/p4-client-path'Junio C Hamano2015-05-112-4/+115
|\
| * git-p4: improve client path detection when branches are usedva/p4-client-pathVitor Antunes2015-04-232-5/+10
| * t9801: check git-p4's branch detection with client spec enabledVitor Antunes2015-04-221-0/+106
* | Merge branch 'mm/add-p-split-error'Junio C Hamano2015-05-112-11/+59
|\ \
| * | stash -p: demonstrate failure of split with mixed y/nmm/add-p-split-errorMatthieu Moy2015-04-161-0/+23
| * | t3904-stash-patch: factor PERL prereq at the top of the fileMatthieu Moy2015-04-161-6/+12
| * | t3904-stash-patch: fix test descriptionMatthieu Moy2015-04-161-1/+1
| * | add -p: demonstrate failure when running 'edit' after a splitMatthieu Moy2015-04-161-0/+22
| * | t3701-add-interactive: simplify codeMatthieu Moy2015-04-161-4/+1
* | | Merge branch 'tb/t0027-crlf'Junio C Hamano2015-05-111-109/+134
|\ \ \
| * | | t0027: Add repoMIX and LF_nulTorsten Bögershausen2015-04-251-72/+85
| * | | t0027: support NATIVE_CRLF platformsTorsten Bögershausen2015-04-181-10/+22
| * | | t0027: cleanup: rename functions; avoid non-leading TABsTorsten Bögershausen2015-04-181-92/+92
* | | | Merge branch 'ls/p4-changes-block-size'Junio C Hamano2015-05-113-14/+119
|\ \ \ \
| * | | | git-p4: use -m when running p4 changesls/p4-changes-block-sizeLex Spoon2015-04-203-14/+119
| |/ / /
* | | | Merge branch 'jc/plug-fmt-merge-msg-leak'Junio C Hamano2015-05-111-5/+11
|\ \ \ \
| * | | | fmt-merge-msg: plug small leak of commit bufferjc/plug-fmt-merge-msg-leakJunio C Hamano2015-04-201-5/+11
* | | | | Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano2015-05-111-111/+179
|\ \ \ \ \
| * | | | | index-pack: kill union delta_base to save memoryNguyễn Thái Ngọc Duy2015-04-181-100/+160
| * | | | | index-pack: reduce object_entry size to save memoryNguyễn Thái Ngọc Duy2015-02-271-11/+19
* | | | | | Merge branch 'jk/still-interesting'Junio C Hamano2015-05-111-4/+19
|\ \ \ \ \ \
| * | | | | | limit_list: avoid quadratic behavior from still_interestingJeff King2015-04-171-4/+19
* | | | | | | Merge branch 'jk/reading-packed-refs'Junio C Hamano2015-05-118-6/+77
|\ \ \ \ \ \ \
| * | | | | | | t1430: add another refs-escape testjk/reading-packed-refsJeff King2015-04-161-0/+8
| * | | | | | | read_packed_refs: avoid double-checking sane refsJeff King2015-04-161-2/+4
| * | | | | | | strbuf_getwholeline: use getdelim if it is availableJeff King2015-04-163-0/+49
| * | | | | | | strbuf_getwholeline: avoid calling strbuf_growJeff King2015-04-161-1/+2
| * | | | | | | strbuf_addch: avoid calling strbuf_growJeff King2015-04-161-1/+2
| * | | | | | | config: use getc_unlocked when reading from fileJeff King2015-04-161-1/+3
| * | | | | | | strbuf_getwholeline: use getc_unlockedJeff King2015-04-161-1/+3
| * | | | | | | git-compat-util: add fallbacks for unlocked stdioJeff King2015-04-161-0/+6
| * | | | | | | strbuf_getwholeline: use getc macroJeff King2015-04-161-1/+1
* | | | | | | | Merge branch 'lm/squelch-bg-progress'Junio C Hamano2015-05-112-8/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | compat/mingw: stubs for getpgid() and tcgetpgrp()Johannes Sixt2015-04-151-2/+6
| * | | | | | | | progress: no progress in backgroundLuke Mewburn2015-04-151-6/+16
* | | | | | | | | Merge branch 'jk/sha1-file-reduce-useless-warnings'Junio C Hamano2015-05-112-6/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_file: squelch "packfile cannot be accessed" warningsjk/sha1-file-reduce-useless-warningsJeff King2015-03-302-6/+2
* | | | | | | | | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-1152-250/+1391
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | prune --worktrees: fix expire vs worktree existence conditionMax Kirillov2015-03-312-3/+19
| * | | | | | | | | | t1501: fix test with split indexThomas Gummerer2015-03-241-0/+1
| * | | | | | | | | | t2026: fix broken &&-chainJunio C Hamano2015-03-201-2/+2
| * | | | | | | | | | t2026 needs procondition SANITYTorsten Bögershausen2015-01-271-1/+1
| * | | | | | | | | | git-checkout.txt: a note about multiple checkout support for submodulesNguyễn Thái Ngọc Duy2015-01-071-0/+3
| * | | | | | | | | | checkout: add --ignore-other-wortreesNguyễn Thái Ngọc Duy2015-01-073-1/+18
| * | | | | | | | | | checkout: pass whole struct to parse_branchname_arg instead of individual flagsNguyễn Thái Ngọc Duy2015-01-071-7/+6
| * | | | | | | | | | git-common-dir: make "modules/" per-working-directory directoryMax Kirillov2014-12-013-4/+52
| * | | | | | | | | | checkout: do not fail if target is an empty directoryMax Kirillov2014-12-012-2/+7
| * | | | | | | | | | t2025: add a test to make sure grafts is working from a linked checkoutNguyễn Thái Ngọc Duy2014-12-011-0/+18
| * | | | | | | | | | checkout: don't require a work tree when checking out into a new oneDennis Kaarsemaker2014-12-013-1/+19
| * | | | | | | | | | git_path(): keep "info/sparse-checkout" per work-treeNguyễn Thái Ngọc Duy2014-12-012-1/+3
View Lorry Controller Status