aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-06
|\
| * diff: run arguments through precompose_argvAlexander Rinass2016-05-13
* | Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-31
|\ \
| * | name-rev: include taggerdate in considering the best nameJohannes Schindelin2016-04-22
| |/
* | Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-26
|\ \
| * | typofix: assorted typofixes in comments, documentation and messagesLi Peng2016-05-06
* | | Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-26
|\ \ \
| * | | i18n: builtin/pull.c: split strings marked for translationVasco Almeida2016-04-19
| * | | i18n: builtin/pull.c: mark placeholders for translationVasco Almeida2016-04-19
| * | | i18n: branch: move comment for translatorsVasco Almeida2016-04-13
| * | | i18n: branch: unmark string for translationVasco Almeida2016-04-13
| * | | i18n: builtin/rm.c: remove a comma ',' from stringVasco Almeida2016-04-12
| * | | i18n: builtin/branch.c: mark option for translationVasco Almeida2016-04-08
| * | | i18n: index-pack: use plural string instead of normal oneVasco Almeida2016-04-08
| |/ /
* | | Merge branch 'va/i18n-remote-comment-to-align' into maintJunio C Hamano2016-05-26
|\ \ \
| * | | i18n: remote: add comment for translatorsVasco Almeida2016-05-09
| |/ /
* | | Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-18
|\ \ \
| * | | notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-01
* | | | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-18
|\ \ \ \
| * | | | pack-objects: warn on split packs disabling bitmapsEric Wong2016-04-28
* | | | | Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-18
|\ \ \ \ \
| * | | | | mv: allow moving nested submodulesStefan Beller2016-04-19
* | | | | | Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-06
|\ \ \ \ \ \
| * | | | | | replace --edit: respect core.editorJohannes Schindelin2016-04-20
| |/ / / / /
| * | | | | Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2016-03-17
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-17
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
* | | | | | | Merge branch 'cc/apply' into maintJunio C Hamano2016-05-06
|\ \ \ \ \ \ \
| * | | | | | | builtin/apply: free patch when parse_chunk() failsChristian Couder2016-04-01
| * | | | | | | builtin/apply: handle parse_binary() failureChristian Couder2016-04-01
| * | | | | | | apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-22
| * | | | | | | builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-22
* | | | | | | | Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not ignore an empty message given by -m ''Jeff King2016-04-07
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule--helper, module_clone: catch fprintf failureStefan Beller2016-04-01
| * | | | | | | | submodule--helper: do not borrow absolute_path() result for too longJunio C Hamano2016-04-01
| * | | | | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-01
| * | | | | | | | submodule--helper clone: create the submodule path just onceStefan Beller2016-03-31
| * | | | | | | | submodule--helper: fix potential NULL-dereferenceStefan Beller2016-03-31
* | | | | | | | | Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch: fix shortening of non-remote symrefsJeff King2016-04-04
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-04
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch -d: refuse deleting a branch which is currently checked outKazuki Yamaguchi2016-03-29
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/check-repository-format' into maintJunio C Hamano2016-05-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | init: use setup.c's repo version verificationJeff King2016-03-11
| * | | | | | | | | wrap shared_repository global in get/set accessorsJeff King2016-03-11
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | correct blame for files commited with CRLFTorsten Bögershausen2016-04-05
| | |_|_|_|/ / / / | |/| | | | | | |