Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
t/lib-submodule-update.sh: fix test ignoring ignored files in submodules
[gitweb.git]
/
git-merge-resolve.sh
2017-08-24
Merge branch 'tc/curl-with-backports'
blob
|
diff
|
raw
2017-08-24
Merge branch 'cc/subprocess-handshake-missing-capabilities'
blob
|
diff
|
raw
2017-08-24
Merge branch 'rs/object-id'
blob
|
diff
|
raw
2017-08-24
Merge branch 'lg/merge-signoff'
blob
|
diff
|
raw
2017-08-23
Sync with maint
blob
|
diff
|
raw
2017-08-23
Merge branch 'mg/format-ref-doc-fix'
blob
|
diff
|
raw
2017-08-23
Merge branch 'sb/submodule-parallel-update'
blob
|
diff
|
raw
2017-08-23
Merge branch 'jc/diff-sane-truncate-no-more'
blob
|
diff
|
raw
2017-08-23
Merge branch 'hv/t5526-andand-chain-fix'
blob
|
diff
|
raw
2017-08-23
Merge branch 'as/grep-quiet-no-match-exit-code-fix'
blob
|
diff
|
raw
2017-08-23
Merge branch 'kw/commit-keep-index-when-pre-commit...
blob
|
diff
|
raw
2017-08-23
Merge branch 'sb/sha1-file-cleanup'
blob
|
diff
|
raw
2017-08-23
Merge branch 'rs/t1002-do-not-use-sum'
blob
|
diff
|
raw
2017-08-23
Merge branch 'kd/stash-with-bash-4.4'
blob
|
diff
|
raw
2017-08-23
Merge branch 'ah/doc-empty-string-is-false'
blob
|
diff
|
raw
2017-08-23
Merge branch 'kw/rebase-progress'
blob
|
diff
|
raw
2017-08-23
Merge branch 'ks/prepare-commit-msg-sample-fix'
blob
|
diff
|
raw
2017-08-23
Merge branch 'nm/stash-untracked'
blob
|
diff
|
raw
2017-08-23
Merge branch 'jt/sha1-file-cleanup'
blob
|
diff
|
raw
2017-08-22
Merge branch 'mh/packed-ref-store'
blob
|
diff
|
raw
2017-08-22
Merge branch 'sb/retire-t1200'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/win32-syslog-leakfix'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/unpack-entry-leakfix'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/strbuf-getwholeline-fix'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/merge-microcleanup'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/fsck-obj-leakfix'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/t4062-obsd'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/find-pack-entry-bisection'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/apply-lose-prefix-length'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rj/add-chmod-error-message'
blob
|
diff
|
raw
2017-08-22
Merge branch 'jk/hashcmp-memcmp'
blob
|
diff
|
raw
2017-08-22
Merge branch 'jk/drop-sha1-entry-pos'
blob
|
diff
|
raw
2017-08-22
Merge branch 'ur/svn-local-zone'
blob
|
diff
|
raw
2017-08-22
Merge branch 'pw/am-signoff'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/t3700-clean-leftover'
blob
|
diff
|
raw
2017-08-22
Merge branch 'jc/perl-git-comment-typofix'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/in-obsd-basename-dirname-take-const'
blob
|
diff
|
raw
2017-08-22
Merge branch 'rs/obsd-getcwd-workaround'
blob
|
diff
|
raw
2017-08-22
Merge branch 'mf/no-dashed-subcommands'
blob
|
diff
|
raw
2017-08-07
scripts: use "git foo" not "git-foo"
blob
|
diff
|
raw
2017-07-25
Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2017-04-17
Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
blob
|
diff
|
raw
|
diff to current
2017-01-18
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2016-10-20
Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'va/i18n' of ../git-gui into va/git-gui...
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'rs/use-modern-git-merge-syntax' of git...
blob
|
diff
|
raw
|
diff to current
2016-09-11
Merge branch 'js/commit-gpgsign' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2016-09-07
Merge branch 'sy/i18n' of git-gui
blob
|
diff
|
raw
|
diff to current
2016-03-21
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-12-21
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jk/make-findstring-makeflags-fix' into...
blob
|
diff
|
raw
|
diff to current
2015-10-05
Merge branch 'jk/make-findstring-makeflags-fix'
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-09-04
Merge branch 'sg/t3020-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-26
Merge branch 'sg/t3020-typofix'
blob
|
diff
|
raw
|
diff to current
2015-04-19
Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2015-03-24
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-26
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
diff
|
raw
|
diff to current
2014-08-10
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-06-27
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-06-26
Merge early parts from git://ozlabs.org/~paulus/gitk.git
blob
|
diff
|
raw
|
diff to current
2014-06-26
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
|
diff to current
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-11-07
Merge branch 'vd/doc-unpack-objects' into maint
blob
|
diff
|
raw
|
diff to current
2013-11-04
Merge branch 'vd/doc-unpack-objects'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'jk/refs-c-squelch-gcc'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'jk/date-c-double-semicolon'
blob
|
diff
|
raw
|
diff to current
2013-06-17
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2013-05-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-05-13
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-03-28
Merge branch 'jc/remove-treesame-parent-in-simplify...
blob
|
diff
|
raw
|
diff to current
2013-01-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2012-10-17
Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2012-09-15
Merge branch 'da/gitk-reload-tag-contents' into maint...
blob
|
diff
|
raw
|
diff to current
2012-09-12
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2012-09-12
Merge branch 'da/gitk-reload-tag-contents'
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'ms/daemon-doc-typo' into maint
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'ms/daemon-doc-typo'
blob
|
diff
|
raw
|
diff to current
2012-06-17
Merge branch 'js/maint-fast-export-mark-error' into...
blob
|
diff
|
raw
|
diff to current
2012-06-12
Merge branch 'js/maint-fast-export-mark-error'
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
|
diff to current
2012-04-16
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
|
diff to current
2012-04-10
Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
blob
|
diff
|
raw
|
diff to current
2012-04-02
Merge branch 'pt/gitk'
blob
|
diff
|
raw
|
diff to current
2012-03-24
Merge gitk changes from Paul Mackerras at git://ozlabs...
blob
|
diff
|
raw
|
diff to current
2011-12-18
Update jk/maint-strbuf-missing-init to builtin/ rename
blob
|
diff
|
raw
|
diff to current
2011-12-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'ml/mailmap' into maint-1.7.6
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2011-11-23
Merge branch 'maint' into tj/imap-send-remove-unused
blob
|
diff
|
raw
|
diff to current
2011-11-21
Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
blob
|
diff
|
raw
|
diff to current
next