Andrew's git
/
gitweb.git
/ search
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
pull: pass --allow-unrelated-histories to "git merge"
2016-04-21
pull: pass --allow-unrelated-histories to "git merge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-04-21
t3033: avoid 'ambiguous refs' warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-23
merge: refuse to create too cool a merge by default
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-17
Git 2.7.4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-17
Sync with Git 2.6.6
diff
|
tree
2016-03-17
Git 2.6.6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-17
Merge branch 'maint-2.5' into maint-2.6
diff
|
tree
2016-03-17
Git 2.5.5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-17
Merge branch 'maint-2.4' into maint-2.5
diff
|
tree
2016-03-17
Git 2.4.11
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-17
Merge branch 'jk/path-name-safety-2.4' into maint-2.4
diff
|
tree
2016-03-16
Merge branch 'jk/path-name-safety-2.7' into maint
diff
|
tree
2016-03-16
Merge branch 'jk/path-name-safety-2.6' into jk/path...
diff
|
tree
2016-03-16
Merge branch 'jk/path-name-safety-2.5' into jk/path...
diff
|
tree
2016-03-16
Merge branch 'jk/path-name-safety-2.4' into jk/path...
diff
|
tree
2016-03-16
list-objects: pass full pathname to callbacks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-16
list-objects: drop name_path entirely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-16
list-objects: convert name_path to a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-16
show_object_with_name: simplify by using path_name()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-16
http-push: stop using name_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-16
tree-diff: catch integer overflow in combine_diff_path...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-16
add helpers for detecting size_t overflow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-10
Git 2.7.3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-03-10
Merge branch 'ma/update-hooks-sample-typofix' into...
diff
|
tree
2016-03-10
Merge branch 'dt/initial-ref-xn-commit-doc' into maint
diff
|
tree
2016-03-10
Merge branch 'ps/plug-xdl-merge-leak' into maint
diff
|
tree
2016-03-10
Merge branch 'ak/git-strip-extension-from-dashed-command...
diff
|
tree
2016-03-10
Merge branch 'ak/extract-argv0-last-dir-sep' into maint
diff
|
tree
2016-03-10
Merge branch 'jk/pack-idx-corruption-safety' into maint
diff
|
tree
2016-03-10
Merge branch 'js/config-set-in-non-repository' into...
diff
|
tree
2016-03-10
Merge branch 'sb/submodule-module-list-fix' into maint
diff
|
tree
2016-03-10
Merge branch 'jk/grep-binary-workaround-in-test' into...
diff
|
tree
2016-03-10
Merge branch 'mm/push-simple-doc' into maint
diff
|
tree
2016-03-10
Merge branch 'jk/tighten-alloc' into maint
diff
|
tree
2016-03-10
Merge branch 'jk/more-comments-on-textconv' into maint
diff
|
tree
2016-03-10
Merge branch 'jk/no-diff-emit-common' into maint
diff
|
tree
2016-03-10
Merge branch 'jc/am-i-v-fix' into maint
diff
|
tree
2016-03-10
Merge branch 'nd/git-common-dir-fix' into maint
diff
|
tree
2016-03-10
Merge branch 'nd/dwim-wildcards-as-pathspecs' into...
diff
|
tree
2016-03-10
Merge branch 'jk/epipe-in-async' into maint
diff
|
tree
2016-03-10
Merge branch 'ps/config-error' into maint
diff
|
tree
2016-03-10
Merge branch 'mg/work-tree-tests' into maint
diff
|
tree
2016-03-10
Merge branch 'sp/remote-curl-ssl-strerror' into maint
diff
|
tree
2016-02-29
compat/mingw: brown paper bag fix for 50a6c8e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-27
sha1_file.c: mark strings for translation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
t5504: handle expected output from SIGPIPE death
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
test_must_fail: report number of unexpected signal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
fetch-pack: ignore SIGPIPE in sideband demuxer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
write_or_die: handle EPIPE in async threads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
refs: document transaction semantics
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
use_pack: handle signed off_t overflow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
nth_packed_object_offset: bounds-check extended offset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
t5313: test bounds-checks of corrupted/malicious pack...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
git config: report when trying to modify a non-existing...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-25
templates/hooks: fix minor typo in the sample update...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-24
submodule helper list: respect correct path prefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-23
t9200: avoid grep on non-ASCII data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-23
t8005: avoid grep on non-ASCII data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-23
Documentation/git-push: document that 'simple' is the...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-23
xdiff/xmerge: fix memory leak in xdl_merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-23
xdiff: drop XDL_EMIT_COMMON
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-23
merge-tree: drop generate_common strategy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-23
merge-one-file: use empty blob for add/add base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
ewah: convert to REALLOC_ARRAY, etc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
convert ewah/bitmap code to use xmalloc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
diff_populate_gitlink: use a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
transport_anonymize_url: use xstrfmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
git-compat-util: drop mempcpy compat code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
sequencer: simplify memory allocation of get_message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
test-path-utils: fix normalize_path_copy output buffer...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
fetch-pack: simplify add_sought_entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
fast-import: simplify allocation in start_packfile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
write_untracked_extension: use FLEX_ALLOC helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
prepare_{git,shell}_cmd: use argv_array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
use st_add and st_mult for allocation size computation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
convert trivial cases to FLEX_ARRAY macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
use xmallocz to avoid size arithmetic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
convert trivial cases to ALLOC_ARRAY
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
convert manual allocations to argv_array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
argv-array: add detach function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
add helpers for allocating flex-array structs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
harden REALLOC_ARRAY and xcalloc against size_t overflow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
Git 2.7.2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
Merge branch 'nd/ita-cleanup' into maint
diff
|
tree
2016-02-22
Merge branch 'pw/completion-stash' into maint
diff
|
tree
2016-02-22
Merge branch 'mm/clean-doc-fix' into maint
diff
|
tree
2016-02-22
Merge branch 'dw/mergetool-vim-window-shuffle' into...
diff
|
tree
2016-02-22
Merge branch 'ah/stripspace-optstring' into maint
diff
|
tree
2016-02-22
diff: clarify textconv interface
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
completion: fix mis-indentation in _git_stash()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
config: rename git_config_set_or_die to git_config_set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
config: rename git_config_set to git_config_set_gently
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
compat: die when unable to set core.precomposeunicode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
sequencer: die on config error when saving replay opts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
init-db: die on config errors when initializing empty...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
clone: die on config error in cmd_clone
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
remote: die on config error when manipulating remotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
remote: die on config error when setting/adding branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
remote: die on config error when setting URL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree
2016-02-22
submodule--helper: die on config error when cloning...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
diff
|
tree