Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
config: write to $XDG_CONFIG_HOME/git/config file when appropriate
[gitweb.git]
/
notes-merge.c
2012-04-28
Merge master branch for tracking l10n updates of next...
blob
|
diff
|
raw
2012-04-27
Merge branch 'jc/merge-reduce-parents-early'
blob
|
diff
|
raw
2012-04-27
Merge branch 'js/fast-import-test-9300'
blob
|
diff
|
raw
2012-04-27
Merge branch 'rt/cherry-revert-conflict-summary'
blob
|
diff
|
raw
2012-04-27
Merge branch 'cb/maint-report-mount-point-correctly...
blob
|
diff
|
raw
2012-04-27
Merge branch 'cb/cherry-pick-rev-path-confusion'
blob
|
diff
|
raw
2012-04-27
Merge branch 'cb/http-multi-curl-auth'
blob
|
diff
|
raw
2012-04-26
Merge branch 'rl/maint-stash-i18n-save-error'
blob
|
diff
|
raw
2012-04-26
Merge branch 'mb/fetch-call-a-non-branch-a-ref'
blob
|
diff
|
raw
2012-04-26
Merge branch 'jm/maint-strncpy-diff-no-index'
blob
|
diff
|
raw
2012-04-26
Merge branch 'jk/run-command-eacces' into maint
blob
|
diff
|
raw
2012-04-26
Merge branch 'jc/push-upstream-sanity' into maint
blob
|
diff
|
raw
2012-04-26
Merge branch 'jc/maint-clean-nested-worktree-in-subdir...
blob
|
diff
|
raw
2012-04-26
Merge branch 'jk/diff-no-rename-empty' into maint
blob
|
diff
|
raw
2012-04-26
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
2012-04-26
Merge branch 'jc/commit-unedited-template' into maint
blob
|
diff
|
raw
2012-04-26
Merge branch 'jk/add-p-skip-conflicts' into maint
blob
|
diff
|
raw
2012-04-26
Merge branch 'jc/commit-hook-authorship' into maint
blob
|
diff
|
raw
2012-04-26
Merge branch 'tr/maint-word-diff-regex-sticky' into...
blob
|
diff
|
raw
2012-04-26
Merge branch 'jh/notes-merge-in-git-dir-worktree' into...
blob
|
diff
|
raw
2012-04-26
Sync with 1.7.8.6
blob
|
diff
|
raw
|
diff to current
2012-04-26
Sync with 1.7.7.7
blob
|
diff
|
raw
|
diff to current
2012-04-24
Merge branch 'fc/completion-tests'
blob
|
diff
|
raw
2012-04-24
Merge branch 'cc/fix-missing-va-end-in-revert'
blob
|
diff
|
raw
2012-04-24
Merge branch 'zj/upstream-error-message'
blob
|
diff
|
raw
2012-04-24
Merge branch 'mk/gitweb-diff-hl'
blob
|
diff
|
raw
2012-04-24
Merge branch 'it/fetch-pack-many-refs'
blob
|
diff
|
raw
2012-04-24
Merge branch 'pw/fast-import-dataref-parsing'
blob
|
diff
|
raw
2012-04-24
Merge branch 'mh/ref-api'
blob
|
diff
|
raw
2012-04-24
Merge branch 'hv/submodule-recurse-push'
blob
|
diff
|
raw
2012-04-23
Merge branch 'bw/test-fix-grep-gnuism'
blob
|
diff
|
raw
2012-04-23
Merge branch 'rj/submodule-mswin-path'
blob
|
diff
|
raw
2012-04-23
Merge branch 'rj/sh-setup-mswin-pwd'
blob
|
diff
|
raw
2012-04-23
Merge branch 'rj/mingw-isguid'
blob
|
diff
|
raw
2012-04-23
Merge branch 'jn/fast-import-doc'
blob
|
diff
|
raw
2012-04-23
Merge branch 'jn/more-i18ncmp'
blob
|
diff
|
raw
2012-04-23
Merge branch 'jl/maint-submodule-recurse-fetch'
blob
|
diff
|
raw
2012-04-23
Merge branch 'jc/maint-blame-minimal'
blob
|
diff
|
raw
2012-04-23
Merge branch 'lp/maint-diff-three-dash-with-graph'
blob
|
diff
|
raw
2012-04-23
Merge branch 'rs/commit-list-sort-in-batch'
blob
|
diff
|
raw
2012-04-23
Merge branch 'jh/apply-free-patch'
blob
|
diff
|
raw
2012-04-23
Merge branch 'sl/test-wc-l-line-count'
blob
|
diff
|
raw
2012-04-23
Merge branch 'jn/debian-customizes-default-editor'
blob
|
diff
|
raw
2012-04-23
Merge branch 'rl/show-empty-prefix'
blob
|
diff
|
raw
2012-04-23
Merge branch 'pw/git-p4'
blob
|
diff
|
raw
2012-04-23
Merge branch 'ms/remote-usage-string'
blob
|
diff
|
raw
2012-04-23
Merge branch 'jk/rebase-i-submodule-conflict-only'
blob
|
diff
|
raw
2012-04-20
Merge branch 'js/spawn-via-shell-path-fix'
blob
|
diff
|
raw
2012-04-20
Merge branch 'ct/advise-push-default'
blob
|
diff
|
raw
2012-04-20
Merge branch 'bw/submodule-sed-solaris'
blob
|
diff
|
raw
2012-04-20
Merge branch 'jk/run-command-eacces'
blob
|
diff
|
raw
2012-04-20
Merge branch 'jc/push-upstream-sanity'
blob
|
diff
|
raw
2012-04-20
Merge branch 'jc/am-report-3way'
blob
|
diff
|
raw
2012-04-20
Merge branch 'jb/am-include'
blob
|
diff
|
raw
2012-04-20
Merge branch 'jc/fmt-merge-msg-people'
blob
|
diff
|
raw
2012-04-16
Merge branch 'jk/add-p-skip-conflicts'
blob
|
diff
|
raw
2012-04-16
Merge branch 'jc/commit-unedited-template'
blob
|
diff
|
raw
2012-04-16
Merge branch 'bw/spawn-via-shell-path'
blob
|
diff
|
raw
2012-04-16
Merge branch 'wk/gitweb-snapshot-use-if-modified-since'
blob
|
diff
|
raw
2012-04-16
Merge branch 'jk/http-backend-keep-committer-ident...
blob
|
diff
|
raw
2012-04-16
Merge branch 'sl/autoconf'
blob
|
diff
|
raw
2012-04-16
Merge branch 'jk/branch-quiet'
blob
|
diff
|
raw
2012-04-16
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
2012-04-16
Merge branch 'jk/diff-no-rename-empty'
blob
|
diff
|
raw
2012-04-16
Merge branch 'jc/maint-clean-nested-worktree-in-subdir'
blob
|
diff
|
raw
2012-04-16
Merge branch 'rs/unpack-trees-leakfix'
blob
|
diff
|
raw
2012-04-16
Merge branch 'nl/rebase-i-cheat-sheet'
blob
|
diff
|
raw
2012-04-16
Merge branch 'da/difftool-test'
blob
|
diff
|
raw
2012-04-16
Merge branch 'zj/test-cred-helper-nicer-prove'
blob
|
diff
|
raw
2012-04-16
Merge branch 'jh/notes-merge-in-git-dir-worktree'
blob
|
diff
|
raw
2012-04-16
Merge branch 'jc/diff-algo-cleanup'
blob
|
diff
|
raw
|
diff to current
2012-04-10
Merge branch 'maint-1.7.8' into maint-1.7.9
blob
|
diff
|
raw
|
diff to current
2012-04-10
Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
blob
|
diff
|
raw
|
diff to current
2012-04-09
Merge branch 'cb/maint-t5541-make-server-port-portable...
blob
|
diff
|
raw
|
diff to current
2012-04-02
Merge branch 'pt/gitk'
blob
|
diff
|
raw
|
diff to current
2012-03-26
Merge branch 'jn/maint-fast-import-empty-ls' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-26
Merge branch 'ph/rerere-doc' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-26
Merge branch 'ms/maint-config-error-at-eol-linecount...
blob
|
diff
|
raw
|
diff to current
2012-03-24
Merge gitk changes from Paul Mackerras at git://ozlabs...
blob
|
diff
|
raw
|
diff to current
2012-03-23
Merge branch 'dw/gitweb-doc-grammo'
blob
|
diff
|
raw
|
diff to current
2012-03-20
Merge branch 'maint-1.7.8' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'jc/maint-verify-objects-remove-pessimism'
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge "two fixes for fast-import's 'ls' command" from...
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'th/doc-diff-submodule-option'
blob
|
diff
|
raw
|
diff to current
2012-03-15
notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE...
blob
|
diff
|
raw
2012-03-15
notes-merge: use opendir/readdir instead of using read_...
blob
|
diff
|
raw
|
diff to current
2012-03-13
Merge branch 'ms/maint-config-error-at-eol-linecount'
blob
|
diff
|
raw
|
diff to current
2012-03-13
Merge branch 'ph/rerere-doc'
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'tr/maint-bundle-boundary' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'jc/maint-diff-patch-header' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'jn/maint-do-not-match-with-unsanitized...
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'jc/am-3-nonstandard-popt' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-08
Merge branch 'jl/maint-submodule-relative'
blob
|
diff
|
raw
|
diff to current
2012-03-08
Merge branch 'jn/maint-do-not-match-with-unsanitized...
blob
|
diff
|
raw
|
diff to current
2012-03-07
Merge branch 'jc/pickaxe-ignore-case'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'jc/maint-diff-patch-header'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'tr/maint-bundle-boundary'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'maint-1.7.8' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'maint-1.7.7' into maint-1.7.8
blob
|
diff
|
raw
|
diff to current
2012-03-05
Merge branch 'jc/doc-merge-options' into maint
blob
|
diff
|
raw
|
diff to current
next