l10n: ca.po: update translation
[git] / builtin / merge.c
2016-03-14  Junio C HamanoMerge branch 'mg/wt-status-mismarked-i18n'
2016-03-10  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix' into...
2016-03-10  Junio C HamanoMerge branch 'dt/initial-ref-xn-commit-doc' into maint
2016-03-10  Junio C HamanoMerge branch 'ps/plug-xdl-merge-leak' into maint
2016-03-10  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-comman...
2016-03-10  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint
2016-03-10  Junio C HamanoMerge branch 'js/config-set-in-non-repository' into...
2016-03-10  Junio C HamanoMerge branch 'sb/submodule-module-list-fix' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test' into...
2016-03-10  Junio C HamanoMerge branch 'mm/push-simple-doc' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/tighten-alloc' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/more-comments-on-textconv' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/no-diff-emit-common' into maint
2016-03-10  Junio C HamanoMerge branch 'jc/am-i-v-fix' into maint
2016-03-10  Junio C HamanoMerge branch 'nd/git-common-dir-fix' into maint
2016-03-10  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' into...
2016-03-10  Junio C HamanoMerge branch 'mg/work-tree-tests' into maint
2016-03-10  Junio C HamanoMerge branch 'jx/http-no-proxy'
2016-03-10  Junio C HamanoMerge branch 'jc/exclusion-doc'
2016-03-10  Junio C HamanoMerge branch 'js/close-packs-before-gc'
2016-03-10  Junio C HamanoMerge branch 'sb/rebase-summary'
2016-03-04  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-03-04  Junio C HamanoMerge branch 'js/pthread-exit-emu-windows'
2016-03-04  Junio C HamanoMerge branch 'sb/submodule-parallel-fetch'
2016-03-04  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety'
2016-03-04  Junio C HamanoMerge branch 'mg/httpd-tests-update-for-apache-2.4'
2016-03-04  Junio C HamanoMerge branch 'js/mingw-tests'
2016-02-26  Junio C HamanoMerge branch 'mm/readme-markdown'
2016-02-26  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix'
2016-02-26  Junio C HamanoMerge branch 'ls/makefile-cflags-developer-tweak'
2016-02-26  Junio C HamanoMerge branch 'dt/initial-ref-xn-commit-doc'
2016-02-26  Junio C HamanoMerge branch 'js/config-set-in-non-repository'
2016-02-26  Junio C HamanoMerge branch 'jk/epipe-in-async'
2016-02-26  Junio C HamanoMerge branch 'mm/push-default-warning'
2016-02-26  Junio C HamanoMerge branch 'fa/merge-recursive-no-rename'
2016-02-26  Junio C HamanoMerge branch 'sb/submodule-fetch-nontip'
2016-02-26  Junio C HamanoMerge branch 'sb/submodule-module-list-fix'
2016-02-26  Junio C HamanoMerge branch 'tb/conversion'
2016-02-26  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test'
2016-02-26  Junio C HamanoMerge branch 'ps/plug-xdl-merge-leak'
2016-02-26  Junio C HamanoMerge branch 'mm/push-simple-doc'
2016-02-26  Junio C HamanoMerge branch 'jg/credential-cache-chdir-to-sockdir'
2016-02-26  Junio C HamanoMerge branch 'ps/config-error'
2016-02-26  Junio C HamanoMerge branch 'mg/work-tree-tests'
2016-02-26  Junio C HamanoMerge branch 'ls/config-origin'
2016-02-26  Junio C HamanoMerge branch 'jk/tighten-alloc'
2016-02-26  Junio C HamanoMerge branch 'jk/more-comments-on-textconv'
2016-02-26  Junio C HamanoMerge branch 'jk/no-diff-emit-common'
2016-02-26  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-command'
2016-02-26  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep'
2016-02-26  Junio C HamanoMerge branch 'kn/ref-filter-atom-parsing'
2016-02-24  Junio C HamanoMerge branch 'jc/am-i-v-fix'
2016-02-24  Junio C HamanoMerge branch 'ew/force-ipv4'
2016-02-24  Junio C HamanoMerge branch 'nd/git-common-dir-fix'
2016-02-24  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22  Jeff Kinguse st_add and st_mult for allocation size computation
2016-02-22  Junio C HamanoMerge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2016-02-22  Junio C HamanoMerge branch 'ew/connect-verbose'
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-02-22  Junio C HamanoMerge branch 'pw/completion-stash' into maint
2016-02-22  Junio C HamanoMerge branch 'dw/mergetool-vim-window-shuffle' into...
2016-02-22  Junio C HamanoMerge branch 'ah/stripspace-optstring' into maint
2016-02-22  Junio C HamanoMerge branch 'pw/completion-stash'
2016-02-17  Junio C HamanoMerge branch 'dw/mergetool-vim-window-shuffle'
2016-02-17  Junio C HamanoMerge branch 'ah/stripspace-optstring'
2016-02-17  Junio C HamanoMerge branch 'jk/rerere-xsnprintf'
2016-02-17  Junio C HamanoMerge branch 'da/user-useconfigonly'
2016-02-17  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-02-17  Junio C HamanoMerge branch 'mg/mingw-test-fix'
2016-02-17  Junio C HamanoMerge branch 'js/mingw-tests'
2016-02-17  Junio C HamanoMerge branch 'jk/drop-rsync-transport'
2016-02-17  Junio C HamanoMerge branch 'js/test-lib-windows-emulated-yes' into...
2016-02-17  Junio C HamanoMerge branch 'aw/push-force-with-lease-reporting' into...
2016-02-17  Junio C HamanoMerge branch 'nd/do-not-move-worktree-manually' into...
2016-02-17  Junio C HamanoMerge branch 'js/xmerge-marker-eol' into maint
2016-02-10  Junio C HamanoMerge branch 'js/test-lib-windows-emulated-yes'
2016-02-10  Junio C HamanoMerge branch 'wp/sha1-name-negative-match'
2016-02-10  Junio C HamanoMerge branch 'jk/options-cleanup'
2016-02-10  Junio C HamanoMerge branch 'aw/push-force-with-lease-reporting'
2016-02-10  Junio C HamanoMerge branch 'ls/clean-smudge-override-in-config'
2016-02-10  Junio C HamanoMerge branch 'ew/connect-verbose'
2016-02-10  Junio C HamanoMerge branch 'cc/untracked'
2016-02-10  Junio C HamanoMerge branch 'js/xmerge-marker-eol'
2016-02-10  Junio C HamanoMerge branch 'nd/do-not-move-worktree-manually'
2016-02-05  Junio C HamanoMerge branch 'lv/add-doc-working-tree' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05  Junio C HamanoMerge branch 'ew/for-each-ref-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/user-manual' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/ref-cache-non-repository-optim' into...
2016-02-05  Junio C HamanoMerge branch 'js/dirname-basename' into maint
2016-02-05  Junio C HamanoMerge branch 'tb/complete-word-diff-regex' into maint
2016-02-05  Junio C HamanoMerge branch 'pw/completion-stash' into maint
2016-02-05  Junio C HamanoMerge branch 'pw/completion-show-branch' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/completion-rebase' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/diff-with-path-params' into maint
2016-02-05  Junio C HamanoMerge branch 'dw/subtree-split-do-not-drop-merge' into...
2016-02-05  Junio C HamanoMerge branch 'ew/svn-1.9.0-auth' into maint
next