Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/warn-on-inaccessible-loosen' | Junio C Hamano | 2013-01-06 | 5 | -7/+31 |
|\ | |||||
| * | config: exit on error accessing any config file | Jonathan Nieder | 2012-10-14 | 1 | -3/+3 |
| * | doc: advertise GIT_CONFIG_NOSYSTEM | Jonathan Nieder | 2012-10-14 | 2 | -0/+12 |
| * | config: treat user and xdg config permission problems as errors | Jonathan Nieder | 2012-10-13 | 3 | -2/+11 |
| * | config, gitignore: failure to access with ENOTDIR is ok | Jonathan Nieder | 2012-10-13 | 2 | -2/+5 |
* | | Merge branch 'jc/apply-trailing-blank-removal' | Junio C Hamano | 2013-01-06 | 1 | -6/+17 |
|\ \ | |||||
| * | | apply.c:update_pre_post_images(): the preimage can be truncated | Junio C Hamano | 2012-10-12 | 1 | -6/+17 |
* | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-01-06 | 1 | -2/+43 |
* | | | Merge branch 'wk/submodule-update-remote' | Junio C Hamano | 2013-01-05 | 6 | -2/+117 |
|\ \ \ | |||||
| * | | | submodule add: If --branch is given, record it in .gitmodules | W. Trevor King | 2012-12-19 | 3 | -0/+7 |
| * | | | submodule update: add --remote for submodule's upstream changes | W. Trevor King | 2012-12-19 | 5 | -2/+84 |
| * | | | submodule: add get_submodule_config helper funtion | W. Trevor King | 2012-12-11 | 1 | -0/+26 |
* | | | | Merge branch 'jk/pathspec-literal' | Junio C Hamano | 2013-01-05 | 5 | -11/+115 |
|\ \ \ \ | |||||
| * | | | | add global --literal-pathspecs option | Jeff King | 2012-12-19 | 5 | -6/+107 |
* | | | | | Merge branch 'jk/error-const-return' | Junio C Hamano | 2013-01-05 | 6 | -9/+29 |
|\ \ \ \ \ | |||||
| * | | | | | silence some -Wuninitialized false positives | Jeff King | 2012-12-15 | 4 | -9/+17 |
| * | | | | | make error()'s constant return value more visible | Jeff King | 2012-12-15 | 2 | -0/+12 |
* | | | | | | Merge branch 'jc/format-color-auto' | Junio C Hamano | 2013-01-05 | 5 | -8/+76 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log --format: teach %C(auto,black) to respect color config | Junio C Hamano | 2012-12-17 | 5 | -4/+72 |
| * | | | | | | t6006: clean up whitespace | Junio C Hamano | 2012-12-17 | 1 | -4/+4 |
* | | | | | | | Merge branch 'jk/complete-commit-c' | Junio C Hamano | 2013-01-05 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: complete refs for "git commit -c" | Jeff King | 2012-12-15 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'ja/directory-attrs' | Junio C Hamano | 2013-01-05 | 3 | -9/+76 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add directory pattern matching to attributes | Jean-Noël AVILA | 2012-12-17 | 3 | -9/+76 |
* | | | | | | | | | Merge branch 'jk/mailmap-from-blob' | Junio C Hamano | 2013-01-05 | 7 | -38/+214 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mailmap: default mailmap.blob in bare repositories | Jeff King | 2012-12-13 | 3 | -3/+35 |
| * | | | | | | | | | mailmap: fix some documentation loose-ends for mailmap.blob | Jeff King | 2012-12-13 | 2 | -2/+3 |
| * | | | | | | | | | mailmap: clean up read_mailmap error handling | Jeff King | 2012-12-12 | 1 | -11/+21 |
| * | | | | | | | | | mailmap: support reading mailmap from blobs | Jeff King | 2012-12-12 | 5 | -2/+129 |
| * | | | | | | | | | mailmap: refactor mailmap parsing for non-file sources | Jeff King | 2012-12-12 | 1 | -34/+40 |
* | | | | | | | | | | Merge branch 'jc/fetch-ignore-symref' | Junio C Hamano | 2013-01-05 | 2 | -1/+54 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fetch: ignore wildcarded refspecs that update local symbolic refs | Junio C Hamano | 2012-12-11 | 2 | -1/+54 |
* | | | | | | | | | | | Merge branch 'cr/push-force-tag-update' | Junio C Hamano | 2013-01-05 | 13 | -60/+188 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | push: allow already-exists advice to be disabled | Chris Rorvick | 2012-12-03 | 4 | -2/+11 |
| * | | | | | | | | | | | push: rename config variable for more general use | Chris Rorvick | 2012-12-03 | 4 | -7/+10 |
| * | | | | | | | | | | | push: cleanup push rules comment | Chris Rorvick | 2012-12-03 | 1 | -15/+17 |
| * | | | | | | | | | | | push: clarify rejection of update to non-commit-ish | Chris Rorvick | 2012-12-02 | 1 | -0/+5 |
| * | | | | | | | | | | | push: require force for annotated tags | Chris Rorvick | 2012-12-02 | 3 | -7/+35 |
| * | | | | | | | | | | | push: require force for refs under refs/tags/ | Chris Rorvick | 2012-12-02 | 9 | -13/+62 |
| * | | | | | | | | | | | push: flag updates that require force | Chris Rorvick | 2012-12-02 | 3 | -5/+12 |
| * | | | | | | | | | | | push: keep track of "update" state separately | Chris Rorvick | 2012-12-02 | 2 | -7/+12 |
| * | | | | | | | | | | | push: add advice for rejected tag reference | Chris Rorvick | 2012-12-02 | 5 | -0/+25 |
| * | | | | | | | | | | | push: return reject reasons as a bitset | Chris Rorvick | 2012-12-02 | 4 | -24/+19 |
* | | | | | | | | | | | | Merge branch 'fc/fast-export-fixes' | Junio C Hamano | 2013-01-05 | 10 | -23/+352 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fast-export: make sure updated refs get updated | Felipe Contreras | 2012-12-03 | 3 | -15/+30 |
| * | | | | | | | | | | | | fast-export: don't handle uninteresting refs | Felipe Contreras | 2012-12-03 | 3 | -4/+45 |
| * | | | | | | | | | | | | fast-export: fix comparison in tests | Felipe Contreras | 2012-11-29 | 1 | -3/+3 |
| * | | | | | | | | | | | | fast-export: trivial cleanup | Felipe Contreras | 2012-11-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | remote-testgit: implement the "done" feature manually | Felipe Contreras | 2012-11-29 | 1 | -1/+3 |
| * | | | | | | | | | | | | remote-testgit: report success after an import | Felipe Contreras | 2012-11-29 | 1 | -0/+13 |