Andrew's git / gitweb.git / search
?
rerere forget path: forget recorded resolution
2010-01-11 rerere forget path: forget recorded resolution
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-01-11 rerere: refactor rerere logic to make it independent...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-26 rerere: remove silly 1024-byte line limit
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-26 resolve-undo: teach "update-index --unresolve" to use...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-26 resolve-undo: "checkout -m path" uses resolve-undo...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-26 resolve-undo: allow plumbing to clear the information
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-26 resolve-undo: basic tests
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-26 resolve-undo: record resolved conflicts in a new index...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-26 builtin-merge.c: use standard active_cache macros
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-23 Git 1.6.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-22 Merge branch 'maint'
 diff | tree
2009-12-22 Prevent git blame from segfaulting on a missing author...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-20 Git 1.6.6-rc4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-20 Merge branch 'maint'
 diff | tree
2009-12-20 rebase -i: abort cleanly if the editor fails to launch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-18 technical-docs: document hash API
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-18 api-strbuf.txt: fix typos and document launch_editor()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-16 Git 1.6.6-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-16 Merge branch 'maint' to sync with 1.6.5.7
 diff | tree
2009-12-16 Git 1.6.5.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-16 worktree: don't segfault with an absolute pathspec...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-16 ignore unknown color configuration
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-16 help.autocorrect: do not run a command if the command...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-15 Illustrate "filter" attribute with an example
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-12 bash: Support new 'git fetch' options
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-11 Update Release Notes for 1.6.6 to remove old bugfixes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-11 Sync with 1.6.5.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-10 Git 1.6.5.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-10 Fix archive format with -- on the command line
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-10 Remove post-upload-hook
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-10 Git 1.6.6-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-09 Merge git://repo.or.cz/git-gui
 diff | tree
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
 diff | tree
2009-12-09 Update draft release notes to 1.6.6 before -rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-09 Merge branch 'maint'
 diff | tree
2009-12-09 Merge branch 'mm/maint-merge-ff-error-message-fix'...
diff | tree
2009-12-09 Merge branch 'jn/maint-pull-rebase-error-message' into...
diff | tree
2009-12-09 Merge branch 'jk/maint-add-p-delete-fix' into maint
 diff | tree
2009-12-09 Merge git://git.bogomips.org/git-svn
 diff | tree
2009-12-08 Revert recent "git merge <msg> HEAD <commit>..." deprecation
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-08 add-interactive: fix deletion of non-empty files
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-06 bash: update 'git commit' completion
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-05 Sync with 1.6.5.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-05 Git 1.6.5.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-05 Fix diff -B/--dirstat miscounting of newly added contents
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-05 reset: improve worktree safety valves
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-05 Documentation: Avoid use of xmlto --stringparam
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-04 archive: clarify description of path parameter
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-04 rerere: don't segfault on failure to open rr-cache
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 Merge branch 'maint'
 diff | tree
2009-12-03 Prepare for 1.6.5.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 Merge branch 'uk/maint-shortlog-encoding' into maint
 diff | tree
2009-12-03 Merge branch 'fc/maint-format-patch-pathspec-dashes...
diff | tree
2009-12-03 Merge branch 'ap/maint-merge-strategy-list-fix' into...
diff | tree
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
 diff | tree
2009-12-03 Merge branch 'rs/work-around-grep-opt-insanity' into...
diff | tree
2009-12-03 Merge branch 'rj/maint-cygwin-count-objects' into maint
 diff | tree
2009-12-03 Merge branch 'mm/maint-hint-failed-merge' into maint
 diff | tree
2009-12-03 Merge branch 'th/maint-remote-update-help-string' into...
diff | tree
2009-12-03 Merge branch 'rj/maint-t9700' into maint
 diff | tree
2009-12-03 Merge branch 'ls/maint-mailinfo-no-inbody' into maint
 diff | tree
2009-12-03 Merge branch 'mo/maint-crlf-doc' into maint
 diff | tree
2009-12-03 Merge branch 'th/remote-usage' into maint
 diff | tree
2009-12-03 Merge branch 'pb/maint-use-custom-perl' into maint
 diff | tree
2009-12-03 Merge branch 'mm/config-pathname-tilde-expand' into...
diff | tree
2009-12-03 Merge branch 'bc/grep-i-F' into maint
 diff | tree
2009-12-03 Merge branch 'jk/maint-break-rename-reduce-memory'...
diff | tree
2009-12-03 Merge branch 'rj/maint-simplify-cygwin-makefile' into...
diff | tree
2009-12-03 Merge branch 'rg/doc-workflow' into maint
 diff | tree
2009-12-03 Merge branch 'np/maint-sideband-favor-status' into...
diff | tree
2009-12-03 gitweb: Describe (possible) gitweb.js minification...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 Documentation: xmlto 0.0.18 does not know --stringparam
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 Fix crasher on encountering SHA1-like non-note in notes...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 t9001: use older Getopt::Long boolean prefix '--no...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 t4201: use ISO8859-1 rather than ISO-8859-1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 pull: clarify advice for the unconfigured error case
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 Merge in 1.6.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 Git 1.6.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 Unconditionally set man.base.url.for.relative.links
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-03 Merge branch 'maint'
 diff | tree
2009-12-03 Documentation/Makefile: allow man.base.url.for.relative...
Signed-off-by: Junio C Hamano <junio@kernel.org>
 diff | tree
2009-12-02 Git 1.6.6-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-02 git-pull.sh: Fix call to git-merge for new command...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-02 Merge branch 'maint'
 diff | tree
2009-12-02 Prepare for 1.6.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-02 merge: do not add standard message when message is...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-02 Do not misidentify "git merge foo HEAD" as an old-style...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-01 Update draft release notes to 1.6.6 before -rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-01 Merge branch 'maint'
 diff | tree
2009-12-01 Merge branch 'jc/deprecate-old-syntax-from-merge'
 diff | tree
2009-12-01 git-merge: a deprecation notice of the ancient command...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-01 Merge branch 'bw/remote-get-ref-states-fix'
 diff | tree
2009-12-01 get_ref_states: strdup entries and free util in stale...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-01 help: Do not unnecessarily look for a repository
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-01 Documentation: Fix a few i.e./e.g. mix-ups
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-01 Merge branch 'jn/gitweb-blame'
 diff | tree
2009-12-01 gitweb: Add link to other blame implementation in blame...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-12-01 gitweb: Make linking to actions requiring JavaScript...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2009-11-30 Merge branch 'fc/maint-format-patch-pathspec-dashes'
 diff | tree
2009-11-30 Merge branch 'mm/maint-merge-ff-error-message-fix'
 diff | tree