Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
submodule: fix NULL correctness in renamed broken submodules
[gitweb.git]
/
merge-recursive.c
2018-05-16
submodule.c: move submodule merging to merge-recursive.c
blob
|
diff
|
raw
2018-05-08
merge: pass aggressive when rename detection is turned off
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge: add merge.renames config setting
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: fix check for skipability of working...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: make "Auto-merging" comment show for...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: fix remainder of was_dirty() to use...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: fix was_tracked() to quit lying with...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: avoid triggering add_cacheinfo error...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: move more is_dirty handling to merge_c...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: improve add_cacheinfo error handling
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: avoid spurious rename/rename conflict...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: fix remaining directory rename + dirty...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: fix overwriting dirty files involved...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: avoid clobbering untracked files with...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: apply necessary modifications for...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: when comparing files, don't include...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: check for file level conflicts then...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: add computation of collisions due...
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: check for directory level conflicts
blob
|
diff
|
raw
|
diff to current
2018-05-08
merge-recursive: add get_directory_renames()
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ma/http-walker-no-partial'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'jc/parseopt-expiry-errors'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ma/fast-export-skip-merge-fix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'tz/doc-git-urls-reference'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'sa/send-email-dedup-some-headers'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'nd/submodule-status-fix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'js/ident-date-fix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'bt/gpg-interface'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'hn/sort-ls-remote'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ab/git-svn-get-record-typofix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'tb/config-default'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'tb/config-type'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'sg/doc-gc-quote-mismatch-fix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'sg/completion-clear-cached'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'sb/worktree-remove-opt-force'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'tq/t1510'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ls/checkout-encoding'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ab/nuke-emacs-contrib'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'nd/warn-more-for-devs'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ds/commit-graph'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'js/empty-config-section-fix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ot/libify-get-ref-atom-value'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'sb/submodule-move-nested'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ab/simplify-perl-makefile'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'bw/protocol-v2'
blob
|
diff
|
raw
|
diff to current
2018-05-06
Replace all die("BUG: ...") calls by BUG() ones
blob
|
diff
|
raw
|
diff to current
2018-05-02
Merge branch 'bw/protocol-v2' into jt/partial-clone...
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'jm/mem-pool'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'tg/use-git-contacts'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'cc/perf-bisect'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'bp/fsmonitor-bufsize-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'cb/bash-completion-ls-files-processing'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'es/worktree-docs'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'es/fread-reads-dir-autoconf-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'ps/test-chmtime-get'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'js/t5404-path-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'jk/ref-array-push'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'en/doc-typoes'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'lw/daemon-log-destination'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'mn/send-email-credential-doc'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'ak/bisect-doc-typofix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'br/mergetools-guiffy'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'nd/worktree-move'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'ks/branch-list-detached-rebase-i'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'jk/t5561-missing-curl'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'bw/commit-partial-from-subdirectory-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'jk/relative-directory-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'jk/flockfile-stdio'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'pw/rebase-signoff'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'pw/rebase-keep-empty-fixes'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'cb/git-gui-ttk-style'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'bp/git-gui-bind-kp-enter'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'bb/git-gui-ssh-key-files'
blob
|
diff
|
raw
|
diff to current
2018-04-24
Merge branch 'bw/protocol-v2' into HEAD
blob
|
diff
|
raw
|
diff to current
2018-04-20
merge-recursive: make a helper function for cleanup...
blob
|
diff
|
raw
|
diff to current
2018-04-20
merge-recursive: split out code for determining diff_fi...
blob
|
diff
|
raw
|
diff to current
2018-04-20
merge-recursive: make !o->detect_rename codepath more...
blob
|
diff
|
raw
|
diff to current
2018-04-20
merge-recursive: fix leaks of allocated renames and...
blob
|
diff
|
raw
|
diff to current
2018-04-20
merge-recursive: introduce new functions to handle...
blob
|
diff
|
raw
|
diff to current
2018-04-20
merge-recursive: move the get_renames() function
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'svn/authors-prog-2' of git://bogomips...
blob
|
diff
|
raw
|
diff to current
2018-04-11
Revert "Merge branch 'en/rename-directory-detection'"
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'eb/cred-helper-ignore-sigpipe'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'lv/tls-1.3'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'pk/test-avoid-pipe-hiding-exit-status'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'rs/status-with-removed-submodule'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'nd/combined-test-helper'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'sb/packfiles-in-repository'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'sb/object-store'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'jc/test-must-be-empty'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'cc/perf-aggregate-sort'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'ab/doc-hash-brokenness'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'bc/hash-independent-tests'
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'ab/drop-contrib-examples'
blob
|
diff
|
raw
|
diff to current
2018-04-11
treewide: replace maybe_tree with accessor methods
blob
|
diff
|
raw
|
diff to current
2018-04-11
treewide: rename tree to maybe_tree
blob
|
diff
|
raw
|
diff to current
2018-04-11
Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
blob
|
diff
|
raw
|
diff to current
2018-04-10
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
|
diff to current
2018-04-10
Merge branch 'yk/filter-branch-non-committish-refs'
blob
|
diff
|
raw
|
diff to current
2018-04-10
Merge branch 'nd/trace-with-env'
blob
|
diff
|
raw
|
diff to current
next