summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs.c: rename transaction.updates to transaction.ref_updatessb/ref-transaction-reflogStefan Beller2014-12-031-7/+7
* refs.c: rename the transaction functionsRonnie Sahlberg2014-12-0312-126/+126
* refs.c: make ref_transaction_delete a wrapper for ref_transaction_updatesb/ref-transaction-unify-to-updateRonnie Sahlberg2014-11-202-21/+3
* refs.c: make ref_transaction_create a wrapper for ref_transaction_updateRonnie Sahlberg2014-11-201-25/+2
* Merge git://github.com/git-l10n/git-poJunio C Hamano2014-11-181-2165/+2392
|\
| * l10n: Update Catalan translationAlex Henrie2014-11-171-2165/+2392
* | Merge branch 'jc/doc-commit-only'Junio C Hamano2014-11-181-2/+3
|\ \
| * | Documentation/git-commit: clarify that --only/--include records the working t...jc/doc-commit-onlyJunio C Hamano2014-11-071-2/+3
* | | Merge branch 'ta/tutorial-modernize'Junio C Hamano2014-11-181-1/+1
|\ \ \
| * | | gittutorial.txt: remove reference to ancient Git versionta/tutorial-modernizeThomas Ackermann2014-11-111-1/+1
* | | | Merge branch 'da/difftool'Junio C Hamano2014-11-182-0/+6
|\ \ \ \
| * | | | difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-142-0/+6
* | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2014-11-171-1990/+2239
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | l10n: de.po: translate 62 new messagesRalf Thielow2014-11-151-1414/+1663
| * | | | l10n: de.po: Fixup one translationStefan Beller2014-11-151-4/+4
| * | | | l10n: de.po: use imperative form for command optionsRalf Thielow2014-11-141-573/+573
* | | | | Git 2.2.0-rc2v2.2.0-rc2Junio C Hamano2014-11-141-1/+1
* | | | | Update draft release notes to 2.2Junio C Hamano2014-11-121-0/+14
* | | | | Sync with 'maint'Junio C Hamano2014-11-120-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'nd/gitignore-trailing-whitespace' into maintJunio C Hamano2014-11-121-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano2014-11-121-18/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | t1410: fix breakage on case-insensitive filesystemsjk/fetch-reflog-df-conflictJeff King2014-11-101-18/+18
* | | | | | | Sync with maintJunio C Hamano2014-11-110-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano2014-11-111-1/+1
| |\ \ \ \ \ \
* | | | | | | | run-command: use void to declare that functions take no parametersRené Scharfe2014-11-101-2/+2
* | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2014-11-106-8882/+10327
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | l10n: Updated Bulgarian translation of git (2296t,0f,0u)Alexander Shopov2014-11-021-1473/+1738
| * | | | | | | l10n: zh_CN: translations for git v2.2.0-rc0Jiang Xin2014-11-021-1477/+1720
| * | | | | | | Merge branch 'fr_2.2.0' of git://github.com/jnavila/gitJiang Xin2014-11-021-1478/+1721
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: fr.po (2296t) update for version 2.2.0Jean-Noel Avila2014-11-011-1478/+1721
| * | | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2014-11-021-1468/+1719
| |\ \ \ \ \ \ \ \
| | * | | | | | | | l10n: sv.po: Update Swedish translation (2296t0f0u)Peter Krefting2014-11-011-1468/+1719
| | |/ / / / / / /
| * | | | | | | | l10n: vi.po: Update new message stringsTran Ngoc Quan2014-11-011-1529/+1777
| |/ / / / / / /
| * | | | | | | l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)Jiang Xin2014-11-011-1457/+1652
* | | | | | | | Sync with maintJunio C Hamano2014-11-101-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Documentation/config.txt: fix minor typoThomas Quinot2014-11-101-1/+1
| * | | | | | | config.txt: fix typoNicolas Dermine2014-11-101-1/+1
* | | | | | | | Merge branch 'js/diff-highlight-avoid-sigpipe'Junio C Hamano2014-11-101-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-highlight: exit when a pipe is brokenjs/diff-highlight-avoid-sigpipeJohn Szakmeister2014-11-041-0/+4
* | | | | | | | | trailer: use CHILD_PROCESS_INIT in apply_command()René Scharfe2014-11-101-2/+1
* | | | | | | | | Git 2.2.0-rc1v2.2.0-rc1Junio C Hamano2014-11-071-1/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2014-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | docs/credential-store: s/--store/--file/Jeff King2014-11-061-1/+1
* | | | | | | | | Merge branch 'nd/gitignore-trailing-whitespace'Junio C Hamano2014-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | gitignore.txt: fix spelling of "backslash"nd/gitignore-trailing-whitespaceBen North2014-11-041-1/+1
* | | | | | | | | Merge branch 'tm/line-log-first-parent'Junio C Hamano2014-11-062-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | line-log: fix crash when --first-parent is usedtm/line-log-first-parentTzvetan Mikov2014-11-042-0/+8
* | | | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano2014-11-064-3/+77
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | ignore stale directories when checking reflog existenceJeff King2014-11-042-2/+36
| * | | | | | | | | fetch: load all default config at startupJeff King2014-11-042-1/+41