| 2010-04-01 |
Christian Couder | revert: add "--strategy" option to choose merge strategy
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-04-01 |
Christian Couder | merge: make function try_merge_command non static
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-04-01 |
Christian Couder | merge: refactor code that calls "git merge-STRATEGY"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-04-01 |
Christian Couder | revert: refactor merge recursive code into its own function
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-04-01 |
Christian Couder | revert: use strbuf to refactor the code that writes...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | merge-recursive: add a label for ancestor
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | cherry-pick, revert: add a label for ancestor
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | revert: clarify label on conflict hunks
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | compat: add mempcpy()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | checkout -m --conflict=diff3: add a label for ancestor
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | merge_trees(): add ancestor label parameter for diff3...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | merge_file(): add comment explaining behavior wrt conflict style
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | checkout --conflict=diff3: add a label for ancestor
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | ll_merge(): add ancestor label parameter for diff3-style output
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | merge-file --diff3: add a label for ancestor
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | xdl_merge(): move file1 and file2 labels to xmparam structure
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | xdl_merge(): add optional ancestor label to diff3-style output
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | tests: document cherry-pick behavior in face of conflicts
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-21 |
Jonathan Nieder | tests: document format of conflicts from checkout -m
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Update draft release notes to 1.7.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Merge branch 'jk/maint-add-ignored-dir'
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Merge branch 'ml/color-grep'
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Merge branch 'jc/color-attrs'
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Merge branch 'cc/reset-keep'
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Merge branch 'fl/askpass'
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Merge branch 'bg/apply-fix-blank-at-eof'
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Merge branch 'bw/union-merge-refactor'
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Merge branch 'maint'
|
commit | commitdiff | tree |
| 2010-03-20 |
Junio C Hamano | Update draft release notes to 1.7.0.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Andreas Gruenbacher | fetch: Fix minor memory leak
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Andreas Gruenbacher | fetch: Future-proof initialization of a refspec on stack
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Andreas Gruenbacher | fetch: Check for a "^{}" suffix with suffixcmp()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Benjamin C Meyer | Fix a spelling mistake in a git-p4 console message
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Brian Gernhardt | Use test_expect_success for test setups
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Imre Deak | daemon: parse_host_and_port SIGSEGV if port is specified
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Jonathan Nieder | Makefile: Fix occasional GIT-CFLAGS breakage
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Jonathan Nieder | Makefile: Fix CDPATH problem
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Brandon Casey | notes.c: remove inappropriate call to return
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-20 |
Stephen Boyd | pull: replace unnecessary sed invocation
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-17 |
Junio C Hamano | Merge branch 'maint'
|
commit | commitdiff | tree |
| 2010-03-17 |
Thomas Rast | Documentation: receive.denyCurrentBranch defaults to 'refuse'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-17 |
Ian Ward Comfort | bash: complete *_HEAD refs if present
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-17 |
Junio C Hamano | Merge branch 'maint'
|
commit | commitdiff | tree |
| 2010-03-15 |
Michael J Gruber | Documentation/git-read-tree: clarify 2-tree merge
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-15 |
Michael J Gruber | Documentation/git-read-tree: fix table layout
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-15 |
Junio C Hamano | Merge branch 'sd/format-patch-to'
|
commit | commitdiff | tree |
| 2010-03-15 |
Junio C Hamano | Merge branch 'tc/http-cleanup'
|
commit | commitdiff | tree |
| 2010-03-15 |
Junio C Hamano | Merge branch 'tc/transport-verbosity'
|
commit | commitdiff | tree |
| 2010-03-15 |
Junio C Hamano | Merge branch 'ld/push-porcelain'
|
commit | commitdiff | tree |
| 2010-03-15 |
Junio C Hamano | Merge branch 'jh/notes'
|
commit | commitdiff | tree |
| 2010-03-14 |
Junio C Hamano | tests for "git add ignored-dir/file" without -f
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-14 |
Jeff King | dir: fix COLLECT_IGNORED on excluded prefixes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-14 |
Junio C Hamano | t0050: mark non-working test as such
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-14 |
Junio C Hamano | Merge branch 'maint'
|
commit | commitdiff | tree |
| 2010-03-14 |
Dave Olszewski | don't use default revision if a rev was specified
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-13 |
René Scharfe | for_each_recent_reflog_ent(): use strbuf, fix offset handling
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-13 |
Junio C Hamano | t/Makefile: remove test artifacts upon "make clean"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-13 |
René Scharfe | blame: fix indent of line numbers
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-13 |
Junio C Hamano | Merge git://git.bogomips.org/git-svn
|
commit | commitdiff | tree |
| 2010-03-13 |
Junio C Hamano | Merge branch 'maint'
|
commit | commitdiff | tree |
| 2010-03-12 |
Junio C Hamano | t5516: Use test_cmp when appropriate
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-12 |
Junio C Hamano | t9400: Use test_cmp when appropriate
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-10 |
Junio C Hamano | Merge branch 'sd/init-template'
|
commit | commitdiff | tree |
| 2010-03-10 |
Junio C Hamano | Merge branch 'sh/am-keep-cr'
|
commit | commitdiff | tree |
| 2010-03-10 |
Junio C Hamano | Merge branch 'cp/add-u-pathspec'
|
commit | commitdiff | tree |
| 2010-03-10 |
Junio C Hamano | Makefile: update check-docs target
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-10 |
Junio C Hamano | Merge branch 'lt/deepen-builtin-source'
|
commit | commitdiff | tree |
| 2010-03-09 |
Junio C Hamano | Documentation: improve description of "git reset --keep"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-08 |
Stephen Boyd | send-email: add --no-cc, --no-to, and --no-bcc
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-08 |
Stephen Boyd | format-patch: add --no-cc, --no-to, and --no-add-headers
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-08 |
Stephen Boyd | format-patch: use a string_list for headers
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Update draft release notes to 1.7.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'maint'
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge accumulated fixes to prepare for 1.7.0.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'mw/maint-gcc-warns-unused-write' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'fn/maint-mkdtemp-compat' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'gb/maint-submodule-env' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'as/maint-expire' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'ml/maint-grep-doc' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'jk/maint-push-tracking-wo-remote' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'jc/fetch-param' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'ne/pack-local-doc' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'jk/maint-add--interactive-delete' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'mm/mkstemps-mode-for-packfiles' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'jc/maint-fix-mailinfo-strip' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'jc/grep-author-all-match-implicit' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'jc/checkout-detached' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Junio C Hamano | Merge branch 'maint-1.6.6' into maint
|
commit | commitdiff | tree |
| 2010-03-08 |
Mark Lodato | grep: Colorize selected, context, and function lines
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-08 |
Mark Lodato | grep: Colorize filename, line number, and separator
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'sp/maint-push-sideband' into maint-1.6.6
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'rs/optim-text-wrap' into maint-1.6.6
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'cc/maint-bisect-paths' into maint-1.6.6
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'mw/maint-gcc-warns-unused-write'
|
commit | commitdiff | tree |
| 2010-03-07 |
Junio C Hamano | Merge branch 'as/maint-expire'
|
commit | commitdiff | tree |
| next |
projects / git.git / search