Andrew's git / gitweb.git / search
?
Extend merge-subtree tests to test -Xsubtree=dir.
2010-01-18 Extend merge-subtree tests to test -Xsubtree=dir.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-01-18 Make "subtree" part more orthogonal to the rest of...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-01-18 pull: Fix parsing of -X<option>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-01-18 Teach git-pull to pass -X<option> to git-merge
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-01-18 git merge -X<option>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-30 git-merge-file --ours, --theirs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-30 Merge remote branch 'ko/master' into HEAD
 diff | tree
2009-11-30 builtin-merge.c: call exclude_cmds() correctly.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-28 Update draft release notes to 1.6.6 before merging...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-28 Makefile: do not clean arm directory
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-27 Merge branch 'maint'
 diff | tree
2009-11-27 Add a notice that only certain functions can print...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-27 builtin-apply.c: pay attention to -p<n> when determining...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-27 gitworkflows: Consistently back-quote git commands
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-25 Merge branch 'rs/work-around-grep-opt-insanity'
 diff | tree
2009-11-25 Explicitly truncate bswap operand to uint32_t
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-25 t1200: fix a timing dependent error
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 Merge branch 'rj/maint-cygwin-count-objects'
 diff | tree
2009-11-24 Documentation: update descriptions of revision options...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 Enable support for IPv6 on MinGW
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 Refactor winsock initialization into a separate function
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 Merge branch 'rs/color-escape-has-zero-width'
 diff | tree
2009-11-24 Merge branch 'bg/apply-doc'
 diff | tree
2009-11-24 Merge branch 'mm/maint-hint-failed-merge'
 diff | tree
2009-11-24 Merge branch 'jc/log-stdin'
 diff | tree
2009-11-24 Merge branch 'mr/gitweb-snapshot'
 diff | tree
2009-11-24 t/gitweb-lib: Split HTTP response with non-GNU sed
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 Merge branch 'cc/replace'
 diff | tree
2009-11-24 Merge branch 'maint'
 diff | tree
2009-11-24 pack-objects: split implications of --all-progress...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 instaweb: restart server if already running
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 prune-packed: only show progress when stderr is a tty
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 remote-curl.c: fix rpc_out()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-24 Protect scripted Porcelains from GREP_OPTIONS insanity
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 mergetool--lib: simplify guess_merge_tool()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 strbuf_add_wrapped_text(): skip over colour codes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 t4014-format-patch: do not assume 'test' is available...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 Fix over-simplified documentation for 'git log -z'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 Add trivial tests for --stdin option to log family
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 Merge branch 'bg/fetch-multi'
 diff | tree
2009-11-23 bisect: simplify calling visualizer using '--bisect...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 Disable CURLOPT_NOBODY before enabling CURLOPT_PUT...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 config documentation: some configs are auto-set by...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 cvsserver doc: database generally can not be reproduced...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 Git v1.6.6-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 Merge branch 'maint'
 diff | tree
2009-11-23 Merge git://git.bogomips.org/git-svn
 diff | tree
2009-11-23 Merge branch 'th/maint-remote-update-help-string'
 diff | tree
2009-11-23 Merge branch 'jn/faster-completion-startup'
 diff | tree
2009-11-23 Merge branch 'rj/maint-t9700'
 diff | tree
2009-11-23 Merge branch 'ls/maint-mailinfo-no-inbody'
 diff | tree
2009-11-23 Merge branch 'mo/maint-crlf-doc'
 diff | tree
2009-11-23 Merge branch 'th/remote-usage'
 diff | tree
2009-11-23 Merge branch 'pb/maint-use-custom-perl'
 diff | tree
2009-11-23 Merge branch 'mm/config-pathname-tilde-expand'
 diff | tree
2009-11-23 Merge branch 'bc/grep-i-F'
 diff | tree
2009-11-23 Merge branch 'jk/maint-break-rename-reduce-memory'
 diff | tree
2009-11-23 Merge branch 'tc/format-attribute'
 diff | tree
2009-11-23 Merge branch 'tr/maint-merge-ours-clarification' (early...
diff | tree
2009-11-23 log --format: document %w
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 grep: unset GREP_OPTIONS before spawning external grep
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 User Manual: Write "Git" instead of "GIT"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 Fix truncated usage messages
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 user-manual: Document that "git merge" doesn't like...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-23 merge-recursive: point the user to commit when file...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-22 apply: Use the term "working tree" consistently
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-22 apply: Format all options using back-quotes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-22 apply: apply works outside a repository
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-22 Clarify and correct -z
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 Documentation: avoid xmlto input error
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 Merge branch 'jc/fix-tree-walk' (early part)
 diff | tree
2009-11-21 Merge branch 'jh/notes' (early part)
 diff | tree
2009-11-21 Merge branch 'sp/smart-http'
 diff | tree
2009-11-21 Merge branch 'bw/autoconf-more'
 diff | tree
2009-11-21 Merge branch 'jn/editor-pager'
 diff | tree
2009-11-21 Merge branch 'rj/cygwin-msvc'
 diff | tree
2009-11-21 Merge branch 'rj/maint-simplify-cygwin-makefile'
 diff | tree
2009-11-21 Merge branch 'bg/format-patch-doc-update'
 diff | tree
2009-11-21 Merge branch 'tr/filter-branch'
 diff | tree
2009-11-21 Merge branch 'sc/protocol-doc'
 diff | tree
2009-11-21 Merge branch 'jl/submodule-add-noname'
 diff | tree
2009-11-21 Merge branch 'sb/ls-tree-parseopt'
 diff | tree
2009-11-21 Merge branch 'rg/doc-workflow'
 diff | tree
2009-11-21 Merge branch 'jn/gitweb-log-history'
 diff | tree
2009-11-21 Merge branch 'jn/help-everywhere'
 diff | tree
2009-11-21 Merge branch 'jp/fetch-cull-many-refs'
 diff | tree
2009-11-21 Add branch management for releases to gitworkflows
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 git am/mailinfo: Don't look at in-body headers when...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 git remote: Separate usage strings for subcommands
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 diffcore-rename: reduce memory footprint by freeing...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 Documentation: fix typos and spelling in replace documentation
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 replace: use a GIT_NO_REPLACE_OBJECTS env variable
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 describe: do not use unannotated tag even if exact...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-21 submodule.c: Squelch a "use before assignment" warning
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-20 Make --stdin option to "log" family read also pathspecs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-20 setup_revisions(): do not call get_pathspec() too early
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-20 Teach --stdin option to "log" family
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-20 read_revision_from_stdin(): use strbuf
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree