?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
t5520: test --rebase failure on unborn branch with index
2015-05-29 Paul Tant5520: test --rebase failure on unborn branch with...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5520: test --rebase with multiple branches
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5520: test work tree fast-forward when fetch updates...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5520: test for failure if index has unresolved entries
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-05-18 Paul Tant5520: test no merge candidates cases
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-05-18 Paul Tant5520: prevent field splitting in content comparisons
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: deprecate 'git merge <message> HEAD <commit...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: handle FETCH_HEAD internally
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: decide if we auto-generate the message early...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: make collect_parents() auto-generate the merge...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: extract prepare_merge_message() logic out
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: narrow scope of merge_names
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: split reduce_parents() out of collect_parents()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: clarify collect_parents() logic
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: small leakfix and code simplification
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: do not check argc to determine number of remote...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: clarify "pulling into void" special case
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanot5520: test pulling an octopus into an unborn branch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanot5520: style fixes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: simplify code flow
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-04-29 Junio C Hamanomerge: test the top-level merge driver
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-01-12 Junio C HamanoGit 2.2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2015-01-12 Junio C HamanoMerge branch 'jk/read-packed-refs-without-path-max...
commit | commitdiff | tree
2015-01-12 Junio C HamanoMerge branch 'mg/add-ignore-errors' into maint
 commit | commitdiff | tree
2015-01-12 Junio C HamanoMerge branch 'mh/find-uniq-abbrev' into maint
 commit | commitdiff | tree
2015-01-12 Junio C HamanoMerge branch 'jk/approxidate-avoid-y-d-m-over-future...
commit | commitdiff | tree
2015-01-12 Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into...
commit | commitdiff | tree
2015-01-12 Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse' into...
commit | commitdiff | tree
2015-01-07 Junio C HamanoMerge branch 'maint-2.1' into maint
 commit | commitdiff | tree
2015-01-07 Junio C HamanoMerge branch 'maint-2.0' into maint-2.1
 commit | commitdiff | tree
2015-01-07 Junio C HamanoMerge branch 'maint-1.9' into maint-2.0
 commit | commitdiff | tree
2015-01-07 Junio C HamanoMerge branch 'maint-1.8.5' into maint-1.9
 commit | commitdiff | tree
2015-01-07 Junio C HamanoMerge branch 'jk/dotgit-case-maint-1.8.5' into maint...
commit | commitdiff | tree
2014-12-29 Jeff Kingis_hfs_dotgit: loosen over-eager match of \u{..47}
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-22 Junio C HamanoPrepare for 2.2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'jk/rebuild-perl-scripts-with-no-perl...
commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'jk/no-perl-tests' into maint
 commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'po/everyday-doc' into maint
 commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'jk/push-simple' into maint
 commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'mh/config-flip-xbit-back-after-checking...
commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'jk/gitweb-with-newer-cgi-multi-param...
commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'rs/receive-pack-use-labs' into maint
 commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'rs/maint-config-use-labs' into maint
 commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'js/windows-open-eisdir-error' into maint
 commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'jk/colors-fix' into maint
 commit | commitdiff | tree
2014-12-22 Junio C HamanoMerge branch 'jk/checkout-from-tree' into maint
 commit | commitdiff | tree
2014-12-22 Alexander Kuleshovclean: typofix
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Junio C HamanoGit 2.2.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Junio C HamanoSync with v2.1.4
 commit | commitdiff | tree
2014-12-17 Junio C HamanoGit 2.1.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Junio C HamanoSync with v2.0.5
 commit | commitdiff | tree
2014-12-17 Junio C HamanoGit 2.0.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Junio C HamanoSync with v1.9.5
 commit | commitdiff | tree
2014-12-17 Junio C HamanoGit 1.9.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Junio C HamanoSync with v1.8.5.6
 commit | commitdiff | tree
2014-12-17 Junio C HamanoGit 1.8.5.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Junio C HamanoMerge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5
 commit | commitdiff | tree
2014-12-17 Johannes Schindelinfsck: complain about NTFS ".git" aliases in trees
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Johannes Schindelinread-cache: optionally disallow NTFS .git variants
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Johannes Schindelinpath: add is_ntfs_dotgit() helper
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Jeff Kingfsck: complain about HFS+ ".git" aliases in trees
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Jeff Kingread-cache: optionally disallow HFS+ .git variants
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Jeff Kingutf8: add is_hfs_dotgit() helper
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Jeff Kingfsck: notice .git case-insensitively
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Jeff Kingt1450: refactor ".", "..", and ".git" fsck tests
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Jeff Kingverify_dotfile(): reject .git case-insensitively
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Jeff Kingread-tree: add tests for confusing paths like ".."...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-17 Jeff Kingunpack-trees: propagate errors adding entries to the...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-10 Jeff Kingread_packed_refs: use skip_prefix instead of static...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-10 Jeff Kingread_packed_refs: pass strbuf to parse_ref_line
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-10 Jeff Kingread_packed_refs: use a strbuf for reading lines
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-09 Ronald Wamplergit-am.txt: --ignore-date flag is not passed to git...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-05 Junio C HamanoMerge branch 'maint' of git://github.com/git-l10n/git...
commit | commitdiff | tree
2014-12-05 Junio C HamanoStart post 2.2 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-05 Jeff Kingfor_each_reflog_ent_reverse: turn leftover check into...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-05 Jeff Kingfor_each_reflog_ent_reverse: fix newlines on block...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-12-01 Jeff Kingpush: truly use "simple" as default, not "upstream"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-26 Junio C HamanoGit 2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-26 Marc BranchaudRelNotes: spelling & grammar tweaks
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-26 Mike Hommeysha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-21 Junio C HamanoGit 2.2.0-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-21 Michael J Gruberadd: ignore only ignored files
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-20 Jeff Kingt4026: test "normal" color
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-20 Jeff Kingconfig: fix parsing of "git config --get-color some...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-20 Jeff Kingdocs: describe ANSI 256-color mode
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-19 Junio C HamanoMerge branch 'sv/submitting-final-patch'
 commit | commitdiff | tree
2014-11-19 Junio C HamanoMerge branch 'sn/tutorial-status-output-example'
 commit | commitdiff | tree
2014-11-19 Junio C HamanoMerge branch 'mh/doc-remote-helper-xref'
 commit | commitdiff | tree
2014-11-19 Junio C HamanoMerge branch 'tb/no-relative-file-url'
 commit | commitdiff | tree
2014-11-19 Junio C HamanoMerge branch 'cc/interpret-trailers'
 commit | commitdiff | tree
2014-11-18 Jeff Kinggitweb: hack around CGI's list-context param() handling
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-18 Jonathan NiederMakefile: have python scripts depend on NO_PYTHON setting
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-18 Jonathan NiederMakefile: simplify by using SCRIPT_{PERL,SH}_GEN macros
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-18 Junio C HamanoMerge git://github.com/git-l10n/git-po
 commit | commitdiff | tree
2014-11-18 Junio C HamanoMerge branch 'jc/doc-commit-only'
 commit | commitdiff | tree
2014-11-18 Junio C HamanoMerge branch 'ta/tutorial-modernize'
 commit | commitdiff | tree
2014-11-18 Junio C HamanoMerge branch 'da/difftool'
 commit | commitdiff | tree
2014-11-18 Jeff Kingt960[34]: mark cvsimport tests as requiring perl
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-18 Jeff Kingt0090: mark add-interactive test with PERL prerequisite
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2014-11-18 Jeff KingMakefile: have perl scripts depend on NO_PERL setting
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
next
MinGW port of GIT