Andrew's git / gitweb.git / search
?
Merge branch 'tg/maint-cache-name-compare'
2012-07-16 Merge branch 'tg/maint-cache-name-compare'
 diff | tree
2012-07-16 Merge branch 'jk/index-pack-streaming-fix'
 diff | tree
2012-07-16 Merge branch 'jk/maint-commit-amend-only-no-paths'
 diff | tree
2012-07-16 Merge branch 'cw/amend-commit-without-message'
 diff | tree
2012-07-16 Merge branch 'jn/makefile-cleanup'
 diff | tree
2012-07-16 Merge branch 'ar/clone-honor-umask-at-top'
 diff | tree
2012-07-16 Merge branch 'jc/apply-3way'
 diff | tree
2012-07-16 Merge branch 'cw/rebase-i-root'
 diff | tree
2012-07-16 Merge branch 'pw/git-p4-move'
 diff | tree
2012-07-14 Merge branch 'pw/git-p4-jobs'
 diff | tree
2012-07-14 Merge branch 'jk/push-delete-ref-error-message'
 diff | tree
2012-07-13 Sixth batch for 1.7.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-13 Merge branch 'jc/refactor-diff-stdin'
 diff | tree
2012-07-13 Merge branch 'tg/ce-namelen'
 diff | tree
2012-07-13 Merge branch 'tb/sanitize-decomposed-utf-8-pathname'
 diff | tree
2012-07-13 Merge branch 'mm/mediawiki-tests'
 diff | tree
2012-07-13 Merge branch 'jn/vcs-svn'
 diff | tree
2012-07-13 Merge branch 'mm/mediawiki-file-attachments'
 diff | tree
2012-07-13 Merge branch 'tr/maint-show-walk'
 diff | tree
2012-07-13 Merge branch 'mz/rebase-no-mbox'
 diff | tree
2012-07-11 Reduce draft release notes to 1.7.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-11 Sync with 1.7.11.2
 diff | tree
2012-07-11 Git 1.7.11.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-11 Merge branch 'jc/maint-blame-unique-abbrev' into maint
 diff | tree
2012-07-11 Merge branch 'rj/platform-pread-may-be-thread-unsafe...
diff | tree
2012-07-11 Merge branch 'th/diff-no-index-fixes' into maint
 diff | tree
2012-07-11 Merge branch 'nd/clone-single-fix' into maint
 diff | tree
2012-07-11 Merge branch 'jc/rev-list-simplify-merges-first-parent...
diff | tree
2012-07-11 Merge branch 'hv/submodule-update-nuke-submodules'...
diff | tree
2012-07-11 Merge branch 'jk/diff-no-index-pager' into maint
 diff | tree
2012-07-11 Merge branch 'mm/verify-filename-fix' into maint
 diff | tree
2012-07-11 Merge branch 'cn/cherry-pick-range-docs' into maint
 diff | tree
2012-07-11 Merge branch 'jc/ustar-checksum-is-unsigned' into maint
 diff | tree
2012-07-11 Merge branch 'jc/bundle-complete-notice' into maint
 diff | tree
2012-07-11 Merge branch 'jc/ls-files-i-dir' into maint
 diff | tree
2012-07-11 Merge branch 'jc/request-pull-match-tagname' into maint
 diff | tree
2012-07-11 cache_name_compare(): do not truncate while comparing...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-10 apply: tests for the --3way option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 rerere: make rr-cache fanout directory honor umask
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: document --3way option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: allow rerere() to work on --3way results
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: register conflicted stages to the index
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: --3way with add/add conflict
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: move verify_index_match() higher
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: plug the three-way merge logic in
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: fall back on three-way merge
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: accept -3/--3way command line option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: move "already exists" logic to check_to_create()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: move check_to_create_blob() closer to its sole...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: further split load_preimage()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: refactor "previous patch" logic
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: split load_preimage() helper function out
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: factor out checkout_target() helper function
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: refactor read_file_or_gitlink()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: clear_image() clears things a bit more
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: a bit more comments on PATH_TO_BE_DELETED
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 apply: fix an incomplete comment in check_patch()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 Merge git://github.com/git-l10n/git-po
 diff | tree
2012-07-09 Fifth batch for 1.7.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-09 Merge branch 'cw/help-over-network'
 diff | tree
2012-07-09 Merge branch 'mz/empty-rebase-test'
 diff | tree
2012-07-09 Merge branch 'pw/git-p4-tests'
 diff | tree
2012-07-09 Merge branch 'js/fast-export-paths-with-spaces'
 diff | tree
2012-07-09 Merge branch 'cw/no-detaching-an-unborn'
 diff | tree
2012-07-09 Merge branch 'vr/use-our-perl-in-tests'
 diff | tree
2012-07-09 Merge branch 'mm/credential-plumbing'
 diff | tree
2012-07-09 Merge branch 'jc/maint-blame-unique-abbrev'
 diff | tree
2012-07-09 Merge branch 'jn/perl-makemaker-leading-paths'
 diff | tree
2012-07-09 Merge branch 'rj/platform-pread-may-be-thread-unsafe'
 diff | tree
2012-07-09 Merge branch 'mm/config-xdg'
 diff | tree
2012-07-05 Fourth batch for 1.7.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-07-05 Merge branch 'nd/clone-single-fix'
 diff | tree
2012-07-05 Merge branch 'th/diff-no-index-fixes'
 diff | tree
2012-07-05 Merge branch 'hv/remote-end-hung-up'
 diff | tree
2012-07-02 Sync with i18n-po updates in maint
# Via Junio C Hamano (1) and Peter Krefting (1)
 diff | tree
2012-07-02 Merge branch 'maint' of git://github.com/git-l10n/git...
diff | tree
2012-07-02 blame: compute abbreviation width that ensures uniqueness
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-06-28 diff-index.c: "git diff" has no need to read blob from...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-06-28 diff-index.c: unify handling of command line paths
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-06-28 diff-index.c: do not pretend paths are pathspecs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-06-28 Third batch for 1.7.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-06-28 Merge branch 'fc/git-prompt-script'
 diff | tree
2012-06-28 Merge branch 'js/submodule-relative'
 diff | tree
2012-06-28 Merge branch 'lk/more-helpful-status-hints'
 diff | tree
2012-06-28 Merge branch 'lk/rebase-i-x'
 diff | tree
2012-06-28 Merge branch 'jc/rev-list-simplify-merges-first-parent'
 diff | tree
2012-06-28 Merge branch 'hv/submodule-update-nuke-submodules'
 diff | tree
2012-06-28 Merge branch 'nd/exclude-workaround-top-heavy'
 diff | tree
2012-06-28 Merge branch 'nd/stream-pack-objects'
 diff | tree
2012-06-28 Merge branch 'nd/stream-index-pack'
 diff | tree
2012-06-28 Merge branch 'mm/verify-filename-fix'
 diff | tree
2012-06-28 Merge branch 'jk/diff-no-index-pager'
 diff | tree
2012-06-26 index-pack: Disable threading on cygwin
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-06-25 Second batch for 1.7.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2012-06-25 Merge branch 'lp/no-cmd-http-fetch'
 diff | tree
2012-06-25 Merge branch 'cn/cherry-pick-range-docs'
 diff | tree
2012-06-25 Merge branch 'lm/git-blame-el'
 diff | tree
2012-06-25 Merge branch 'rs/ipv6-ssh-url'
 diff | tree
2012-06-25 Merge branch 'jc/ustar-checksum-is-unsigned'
 diff | tree
2012-06-25 Merge branch 'rs/git-blame-mapcar-mapc'
 diff | tree