aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6438-submodule-directory-file-conflicts.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6438-submodule-directory-file-conflicts.sh')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-15 19:36:19 +0000
/span>/+1 2010-08-17mergetool: Skip autoresolved pathsDavid Aguilar2-17/+57 2010-08-16Userdiff patterns for C#Petr Onderka3-1/+19 2010-08-15log: test for regression introduced in v1.7.2-rc0~103^2~2Ævar Arnfjörð Bjarmason1-1/+13 2010-08-15git-svn: fix fetch with deleted tagDavid D. Kilzer3-2/+99 2010-08-15git-svn: fix regex to remove "tail" from svn tagsDavid D. Kilzer1-1/+1 2010-08-13git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey1-2/+2 2010-08-13git-rebase--interactive.sh: rework skip_unnecessary_picksBrandon Casey1-9/+14 2010-08-13diff --follow: do call diffcore_std() as necessaryJunio C Hamano4-16/+27 2010-08-13diff --follow: do not waste cycles while recursingJunio C Hamano1-1/+1 2010-08-12perl/Makefile: Unset INSTALL_BASE when making perl.makÆvar Arnfjörð Bjarmason1-1/+1 2010-08-12pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2-2/+11 2010-08-12t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren1-0/+62 2010-08-12push: mention "git pull" in error message for non-fast forwardsMatthieu Moy1-2/+2 2010-08-12Standardize do { ... } while (0) styleJonathan Nieder4-10/+10 2010-08-12t/t7003: replace \t with literal tab in sed expressionBrandon Casey1-1/+1 2010-08-12index-pack: Don't follow replace refs.Nelson Elhage2-0/+8 2010-08-11Allow HTTP user agent string to be modified.Spencer E. Olson3-2/+18 2010-08-11post-receive-email: remove spurious commas in email subjectMatthieu Moy1-1/+1 2010-08-11fast-import: export correctly marks larger than 2^20-1Raja R Harinath2-1/+58 2010-08-11t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATHÆvar Arnfjörð Bjarmason1-3/+2