3707 Commits (137c6eaa885a421346f0a5abbc3cc4903671fbeb)

Author SHA1 Message Date
Jonathan Nieder c4151629e7 checkout -m --conflict=diff3: add a label for ancestor 15 years ago
Jonathan Nieder f0531a2937 checkout --conflict=diff3: add a label for ancestor 15 years ago
Jonathan Nieder 4bb0936206 merge-file --diff3: add a label for ancestor 15 years ago
Jonathan Nieder 6a843348ab tests: document cherry-pick behavior in face of conflicts 15 years ago
Jonathan Nieder 47349a8cc0 tests: document format of conflicts from checkout -m 15 years ago
Brian Gernhardt 4a45f7dd49 Use test_expect_success for test setups 15 years ago
Junio C Hamano b75aea8f5b tests for "git add ignored-dir/file" without -f 15 years ago
Junio C Hamano 0d7c2430ab t0050: mark non-working test as such 15 years ago
Dave Olszewski 8fcaca3ff2 don't use default revision if a rev was specified 15 years ago
Junio C Hamano 34b383e7cd t/Makefile: remove test artifacts upon "make clean" 15 years ago
René Scharfe 00fb3d214c blame: fix indent of line numbers 15 years ago
Tuomas Suutari 95109f2947 t9150,t9151: Add rewrite-root option to init 15 years ago
Junio C Hamano c296134d03 t5516: Use test_cmp when appropriate 15 years ago
Junio C Hamano 4a2284b999 t9400: Use test_cmp when appropriate 15 years ago
Stephen Boyd f434c083a0 send-email: add --no-cc, --no-to, and --no-bcc 15 years ago
Stephen Boyd c42600346b format-patch: add --no-cc, --no-to, and --no-add-headers 15 years ago
Junio C Hamano 8b124135a9 color: allow multiple attributes 15 years ago
Bert Wesarg 5565f47c40 unset GREP_OPTIONS in test-lib.sh 15 years ago
Björn Gustavsson 59f5ced65b t3417: Add test cases for "rebase --whitespace=fix" 15 years ago
Björn Gustavsson c1376c12b7 t4124: Add additional tests of --whitespace=fix 15 years ago
Björn Gustavsson 24ff4d56cf apply: Remove the quick rejection test 15 years ago
Christian Couder 812d2a3d61 reset: disallow using --keep when there are unmerged entries 15 years ago
Christian Couder ab892a19e8 reset: disallow "reset --keep" outside a work tree 15 years ago
Stephen Boyd c9c8c56e07 t7406: Fix submodule init config tests 15 years ago
Steven Drake ae6c098f15 Add 'git format-patch --to=' option and 'format.to' configuration variable. 15 years ago
Erik Faye-Lund a9f979093d hash-object: support --stdin-paths with --no-filters 15 years ago
Michael J Gruber 3acae29e81 t9119-git-svn-info.sh: test with svn 1.6.* as well 15 years ago
Bert Wesarg 11f3aa2305 merge-file: add option to specify the marker size 15 years ago
Jakub Narebski 9be3614eff gitweb: Fix project-specific feature override behavior 15 years ago
Tay Ray Chuan 6cbd6e9261 t554[01]-http-push: refactor, add non-ff tests 15 years ago
Tay Ray Chuan fe4bc2a5ae t5541-http-push: check that ref is unchanged for non-ff test 15 years ago
Christian Couder 8f69f72fca bisect: error out when passing bad path parameters 15 years ago
Stefan-W. Hahn 6d8d8e0de3 git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` 15 years ago
Larry D'Anna fbe4f447ec git-push: add tests for git push --porcelain 15 years ago
Adam Simpkins 4a9f439415 reflog: honor gc.reflogexpire=never 15 years ago
Adam Simpkins cbf731ed4e prune: honor --expire=never 15 years ago
Tuomas Suutari 6a2009e7f3 git-svn: Fix discarding of extra parents from svn:mergeinfo 15 years ago
Tuomas Suutari 9560808f2e t9151: Add two new svn:mergeinfo test cases 15 years ago
Tuomas Suutari ae5b370c9b t9151: Fix a few commits in the SVN dump 15 years ago
Steven Drake a94d305bf8 t/t0001-init.sh: add test for 'init with init.templatedir set' 15 years ago
Johannes Sixt 3fdcdbdf30 Windows: redirect f[re]open("/dev/null") to f[re]open("nul") 15 years ago
Johannes Sixt 97a449ee30 t3301-notes: insert a shbang line in ./fake_editor.sh 15 years ago
Junio C Hamano e6cc51046f fetch --all/--multiple: keep all the fetched branch information 15 years ago
Junio C Hamano bba5322a71 builtin-fetch --all/--multi: propagate options correctly 15 years ago
Junio C Hamano 13e65fe631 t5521: fix and modernize 15 years ago
Jeff King e1327ed5fb add-interactive: fix bogus diff header line ordering 15 years ago
Matthieu Moy 5256b00631 Use git_mkstemp_mode instead of plain mkstemp to create object files 15 years ago
Matthieu Moy f80c7ae8fe Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. 15 years ago
Matthieu Moy 7aba6185d5 Add a testcase for ACL with restrictive umask. 15 years ago
Jonathan Nieder 8c33b4cf67 tests: Fix race condition in t7006-pager 15 years ago