summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-11-21mergetools: stop setting $status in merge_cmd()David Aguilar
2014-11-21mergetool: simplify conditionalsDavid Aguilar
2014-11-21difftool--helper: add explicit exit statementDavid Aguilar
2014-11-21mergetool--lib: remove use of $status globalDavid Aguilar
2014-11-21mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano
2014-11-18Merge branch 'da/difftool'Junio C Hamano
2014-11-17Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano
2014-11-15l10n: de.po: translate 62 new messagesRalf Thielow
2014-11-15l10n: de.po: Fixup one translationStefan Beller
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar
2014-11-14Git 2.2.0-rc2v2.2.0-rc2Junio C Hamano
2014-11-14l10n: de.po: use imperative form for command optionsRalf Thielow
2014-11-12Update draft release notes to 2.2Junio C Hamano
2014-11-12Sync with 'maint'Junio C Hamano
2014-11-12Merge branch 'nd/gitignore-trailing-whitespace' into maintJunio C Hamano
2014-11-12Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano
2014-11-11Sync with maintJunio C Hamano
2014-11-11Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano
2014-11-10run-command: use void to declare that functions take no parametersRené Scharfe
2014-11-10Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano
2014-11-10Sync with maintJunio C Hamano
2014-11-10Merge branch 'js/diff-highlight-avoid-sigpipe'Junio C Hamano
2014-11-10Documentation/config.txt: fix minor typoThomas Quinot
2014-11-10config.txt: fix typoNicolas Dermine
2014-11-10trailer: use CHILD_PROCESS_INIT in apply_command()René Scharfe
2014-11-10t1410: fix breakage on case-insensitive filesystemsJeff King
2014-11-07Git 2.2.0-rc1v2.2.0-rc1Junio C Hamano
2014-11-06Merge branch 'maint'Junio C Hamano
2014-11-06Merge branch 'nd/gitignore-trailing-whitespace'Junio C Hamano
2014-11-06Merge branch 'tm/line-log-first-parent'Junio C Hamano
2014-11-06Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano
2014-11-06Merge branch 'rs/use-child-process-init-more'Junio C Hamano
2014-11-06Merge branch 'jk/cache-tree-protect-from-broken-libgit2'Junio C Hamano
2014-11-06docs/credential-store: s/--store/--file/Jeff King
2014-11-04gitignore.txt: fix spelling of "backslash"Ben North
2014-11-04diff-highlight: exit when a pipe is brokenJohn Szakmeister
2014-11-04Documentation: typofixesThomas Ackermann
2014-11-04line-log: fix crash when --first-parent is usedTzvetan Mikov
2014-11-04ignore stale directories when checking reflog existenceJeff King
2014-11-04fetch: load all default config at startupJeff King
2014-11-03RelNotes/2.2.0.txt: fix minor typosMatthieu Moy
2014-11-02l10n: Updated Bulgarian translation of git (2296t,0f,0u)Alexander Shopov
2014-11-02l10n: zh_CN: translations for git v2.2.0-rc0Jiang Xin
2014-11-02Merge branch 'fr_2.2.0' of git://github.com/jnavila/gitJiang Xin
2014-11-02Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin
2014-11-01l10n: sv.po: Update Swedish translation (2296t0f0u)Peter Krefting
2014-11-01l10n: fr.po (2296t) update for version 2.2.0Jean-Noel Avila
2014-11-01l10n: vi.po: Update new message stringsTran Ngoc Quan
2014-10-31l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)Jiang Xin
2014-10-31Git 2.2.0-rc0v2.2.0-rc0Junio C Hamano