aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | Documentation: remove backslash before ~ in fast-import manualJonathan Nieder2010-08-20
| * | | | | | | | Documentation: remove stray backslash from "git bundle" manualJonathan Nieder2010-08-20
| * | | | | | | | Documentation/technical: avoid stray backslash in parse-options API docsJonathan Nieder2010-08-20
| * | | | | | | | Documentation: remove backslashes in manpage synopsesJonathan Nieder2010-08-20
| * | | | | | | | Documentation: clarify quoting in gitignore docsJonathan Nieder2010-08-20
| * | | | | | | | Documentation: clarify quoting in "git rm" exampleJonathan Nieder2010-08-20
| * | | | | | | | Documentation: add missing quotes to "git grep" examplesJonathan Nieder2010-08-20
| * | | | | | | | Documentation: clarify quoting in "git add" exampleJonathan Nieder2010-08-20
| * | | | | | | | Documentation: unbreak regex in show-ref manualJonathan Nieder2010-08-20
| * | | | | | | | Documentation: quoting trouble in "git rm" discussionJonathan Nieder2010-08-20
| * | | | | | | | Documentation: tweak description of log.dateJonathan Nieder2010-08-20
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-03
|\ \ \ \ \ \ \ \
| * | | | | | | | merge script: learn --[no-]rerere-autoupdateJonathan Nieder2010-08-18
| * | | | | | | | merge script: notice @{-1} shorthandJonathan Nieder2010-08-18
| * | | | | | | | merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-18
| * | | | | | | | merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-18
| * | | | | | | | merge script: handle many-way octopusJonathan Nieder2010-08-18
| * | | | | | | | merge script: handle -m --log correctlyJonathan Nieder2010-08-18
| * | | | | | | | merge script: forbid merge -s indexJonathan Nieder2010-08-18
| * | | | | | | | merge script: allow custom strategiesJonathan Nieder2010-08-18
| * | | | | | | | merge script: merge -X<option>Jonathan Nieder2010-08-18
| * | | | | | | | merge script: improve log message subjectJonathan Nieder2010-08-18
| * | | | | | | | merge script: refuse to merge during mergeJonathan Nieder2010-08-18
| * | | | | | | | merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-18
| * | | | | | | | merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-18
| * | | | | | | | fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-18
| * | | | | | | | merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-18
| * | | | | | | | merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-18
| * | | | | | | | Documentation: add a SEE ALSO section for merge-baseJonathan Nieder2010-08-18
| * | | | | | | | t6200 (fmt-merge-msg): style nitpicksJonathan Nieder2010-08-18
| * | | | | | | | t6010 (merge-base): modernize styleJonathan Nieder2010-08-18
| * | | | | | | | t7600 (merge): test merge from branch yet to be bornJonathan Nieder2010-08-18
| * | | | | | | | t7600 (merge): check reflog entryJonathan Nieder2010-08-18
| * | | | | | | | t7600 (merge): do not launch gitk for --debugJonathan Nieder2010-08-18
| * | | | | | | | t7600 (merge): modernize styleJonathan Nieder2010-08-18
| * | | | | | | | merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-18
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-recursive --renormalizeJonathan Nieder2010-08-06
| * | | | | | | | rerere: never renormalizeJonathan Nieder2010-08-06
| * | | | | | | | rerere: migrate to parse-options APIJonathan Nieder2010-08-06
| * | | | | | | | t4200 (rerere): modernize styleJonathan Nieder2010-08-06
| * | | | | | | | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-06
| * | | | | | | | ll-merge: make flag easier to populateJonathan Nieder2010-08-06
| * | | | | | | | Documentation/technical: document ll_mergeJonathan Nieder2010-08-06
| * | | | | | | | merge-trees: let caller decide whether to renormalizeJonathan Nieder2010-08-06
| * | | | | | | | merge-trees: push choice to renormalize away from low levelJonathan Nieder2010-08-06
| * | | | | | | | t6038 (merge.renormalize): check that it can be turned offJonathan Nieder2010-08-06
| * | | | | | | | t6038 (merge.renormalize): try checkout -m and cherry-pickJonathan Nieder2010-08-06
| * | | | | | | | t6038 (merge.renormalize): style nitpicksJonathan Nieder2010-08-06
| * | | | | | | | Don't expand CRLFs when normalizing text during mergeEyvind Bernhardsen2010-07-02
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-02 16:37:20 +0000