projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git notes merge: Manual conflict resolution, part 2/2
[git] / t /
2010-11-17  Johan Herlandgit notes merge: Manual conflict resolution, part 2/2 tree | commitdiff
2010-11-17  Johan Herlandgit notes merge: Manual conflict resolution, part 1/2 tree | commitdiff
2010-11-17  Johan Herlandgit notes merge: Add automatic conflict resolvers ... tree | commitdiff
2010-11-17  Johan Herlandgit notes merge: Handle real, non-conflicting notes... tree | commitdiff
2010-11-17  Johan Herlandgit notes merge: Initial implementation handling trivia... tree | commitdiff
2010-11-17  Johan Herlandnotes.c: Use two newlines (instead of one) when concate... tree | commitdiff
2010-11-17  Johan Herland(trivial) t3303: Indent with tabs instead of spaces... tree | commitdiff
2010-08-09  Thomas Rastt7003: fix subdirectory-filter test tree | commitdiff
2010-08-06  Jonathan NiederAllow "check-ref-format --branch" from subdirectory tree | commitdiff
2010-08-03  Junio C HamanoMerge branch 'sv/maint-diff-q-clear-fix' into maint tree | commitdiff
2010-08-03  Junio C HamanoMerge branch 'rr/svn-fe' into maint tree | commitdiff
2010-08-03  Junio C HamanoMerge branch 'pt/git-gui' into maint tree | commitdiff
2010-08-02  Junio C HamanoMerge branch 'ab/tap' into maint tree | commitdiff
2010-08-02  Ævar Arnfjörð Bjar... test-lib: Remove 3 year old no-op --no-python option tree | commitdiff
2010-08-02  Ævar Arnfjörð Bjar... test-lib: Ignore --quiet under a TAP harness tree | commitdiff
2010-08-02  Junio C HamanoMerge git://repo.or.cz/git-gui into pt/git-gui tree | commitdiff
2010-07-28  David D. KilzerFix git rebase --continue to work with touched files tree | commitdiff
2010-07-27  Junio C HamanoSync with 1.7.1.2 tree | commitdiff
2010-07-27  Junio C HamanoSync with 1.7.0 series tree | commitdiff
2010-07-27  Jonathan Niederconfig --get --path: check for unset $HOME tree | commitdiff
2010-07-26  Johannes Sixtt3700-add: fix dependence on stdout and stderr buffering tree | commitdiff
2010-07-26  Brandon Caseygit-rebase--interactive.sh: use printf instead of echo... tree | commitdiff
2010-07-26  Junio C HamanoMerge branch 'maint-1.7.1' into maint tree | commitdiff
2010-07-26  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1 tree | commitdiff
2010-07-26  Junio C HamanoMerge branch 'maint-1.6.6' into maint-1.7.0 tree | commitdiff
2010-07-26  Junio C HamanoMerge branch 'maint-1.6.5' into maint-1.6.6 tree | commitdiff
2010-07-26  Junio C HamanoMerge branch 'maint-1.6.4' into maint-1.6.5 tree | commitdiff
2010-07-21  Junio C Hamanotests: correct "does reflog exist?" tests tree | commitdiff
2010-07-21  Brandon Caseyt/: work around one-shot variable assignment with test_... tree | commitdiff
2010-07-21  Jonathan Niedert/README: correct an exception when breaking a && chain... tree | commitdiff
2010-07-20  Brandon Caseyt/{t5541,lib-httpd}: replace problematic '!()' notation... tree | commitdiff
2010-07-20  Brandon Caseyt/t3700: convert two uses of negation operator '!'... tree | commitdiff
2010-07-20  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-20  Brandon Caseyt/README: clarify test_must_fail description tree | commitdiff
2010-07-19  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-19  Jens Lehmanngit submodule add: Require the new --force option to... tree | commitdiff
2010-07-19  Junio C HamanoMerge branch 'jl/add-n-ignore-missing' tree | commitdiff
2010-07-16  Junio C HamanoMerge branch 'jc/diff-merge-base-multi' tree | commitdiff
2010-07-16  Thomas RastOnly run aggregate-results over actual counts tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'jn/paginate-fix' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'wp/merge-tree-fix' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'js/merge-rr-fix' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'jc/diff-merge-base-multi' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'ns/merge-recursive-uptodate' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'jn/tests' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'eb/doc-log-manpage' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'jn/grep-open' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'mg/revision-doc' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'jk/maint-status-keep-index-timestamp' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'jc/rebase-i-commit-msg-fix' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'ab/submodule-add-f' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'bc/maint-makefile-fixes' tree | commitdiff
2010-07-15  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-14  Jonathan Niedergit --paginate: paginate external commands again tree | commitdiff
2010-07-14  Jay SoffianMERGE_RR is in .git, not .git/rr-cache tree | commitdiff
2010-07-14  Will Palmermerge-tree: fix where two branches share no changes tree | commitdiff
2010-07-14  Will Palmeradd basic tests for merge-tree tree | commitdiff
2010-07-14  Junio C HamanoMerge branch 'jc/read-tree-cache-tree-fix' tree | commitdiff
2010-07-13  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-12  Jens Lehmanngit add: Add the "--ignore-missing" option for the... tree | commitdiff
2010-07-12  Michael J Grubertest-lib: TAP compliance for skipping tests on request tree | commitdiff
2010-07-12  Michael J Grubertest-lib: simplify GIT_SKIP_TESTS loop tree | commitdiff
2010-07-12  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-12  Jonathan Niedert3000 (ls-files -o): modernize style tree | commitdiff
2010-07-09  Johannes Sixtt0005: work around strange $? in ksh when program termi... tree | commitdiff
2010-07-09  Junio C HamanoMerge remote branch 'ko/master' into jc/read-tree-cache... tree | commitdiff
2010-07-09  Ævar Arnfjörð Bjar... tests: Use skip_all=* to skip tests tree | commitdiff
2010-07-09  Junio C HamanoFix "read-tree -m A B" priming the cache-tree tree | commitdiff
2010-07-08  Jonathan Niedert9118 (git-svn): prevent early failure from taking... tree | commitdiff
2010-07-08  Michael J Grubert9118: avoid PEG revision identifier in tests tree | commitdiff
2010-07-07  Nazri Ramliygrep -O: Do not pass color sequences as filenames to... tree | commitdiff
2010-07-07  Junio C HamanoMerge branch 'ab/tap' tree | commitdiff
2010-07-07  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-07  Junio C HamanoMerge branch 'maint-1.6.4' into maint tree | commitdiff
2010-07-07  Uwe Kleine-Königrev-parse: fix --parse-opt --keep-dashdash --stop-at... tree | commitdiff
2010-07-07  Junio C HamanoMerge branch 'mg/doc-rev-parse-treepath-syntax' into... tree | commitdiff
2010-07-07  Junio C HamanoMerge branch 'tr/receive-pack-aliased-update-fix' into... tree | commitdiff
2010-07-07  Brandon Caseyt/t0006: specify timezone as EST5 not EST to comply... tree | commitdiff
2010-07-07  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-07  Heiko Voigtadd missing && to submodule-merge testcase tree | commitdiff
2010-07-07  Jonathan Niedert/README: document more test helpers tree | commitdiff
2010-07-06  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-06  Junio C Hamanorebase-i: do not get fooled by a log message ending... tree | commitdiff
2010-07-05  Jeff Kingparse_date: fix signedness in timezone calculation tree | commitdiff
2010-07-05  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-07-05  Jeff Kingt0006: test timezone parsing tree | commitdiff
2010-07-05  Ævar Arnfjörð Bjar... git submodule: add submodules with git add -f <path> tree | commitdiff
2010-07-05  Junio C Hamanot/README: proposed rewording... tree | commitdiff
2010-07-05  Ævar Arnfjörð Bjar... t/README: Document the do's and don'ts of tests tree | commitdiff
2010-07-05  Ævar Arnfjörð Bjar... t/README: Add a section about skipping tests tree | commitdiff
2010-07-05  Ævar Arnfjörð Bjar... t/README: Document test_expect_code tree | commitdiff
2010-07-05  Ævar Arnfjörð Bjar... t/README: Document test_external* tree | commitdiff
2010-07-05  Ævar Arnfjörð Bjar... t/README: Document the prereq functions, and 3-arg... tree | commitdiff
2010-07-05  Ævar Arnfjörð Bjar... t/README: Typo: paralell -> parallel tree | commitdiff
2010-07-05  Ævar Arnfjörð Bjar... t/README: The trash is in 't/trash directory.$name' tree | commitdiff
2010-06-30  Junio C HamanoMerge branch 'ar/decorate-color' tree | commitdiff
2010-06-30  Junio C HamanoMerge branch 'mg/doc-rev-parse-treepath-syntax' tree | commitdiff
2010-06-30  Junio C HamanoMerge branch 'cc/cherry-pick-stdin' tree | commitdiff
2010-06-30  Junio C HamanoMerge branch 'jl/status-ignore-submodules' tree | commitdiff
2010-06-30  Junio C HamanoMerge branch 'jk/url-decode' tree | commitdiff
next
Unnamed repository; edit this file 'description' to name the repository.