Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | merge: teach --autostash option | Denton Liu | 2020-04-10 | 1 | -0/+2 | |
| |/ | ||||||
* | | Merge branch 'bc/sha-256-part-1-of-4' | Junio C Hamano | 2020-03-27 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | commit: use expected signature header for SHA-256 | brian m. carlson | 2020-02-24 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'pw/advise-rebase-skip' | Junio C Hamano | 2020-03-25 | 1 | -16/+24 | |
|\ \ | |/ |/| | ||||||
| * | commit: give correct advice for empty commit during a rebase | Phillip Wood | 2019-12-06 | 1 | -5/+19 | |
| * | commit: encapsulate determine_whence() for sequencer | Phillip Wood | 2019-12-06 | 1 | -4/+1 | |
| * | commit: use enum value for multiple cherry-picks | Phillip Wood | 2019-12-06 | 1 | -14/+11 | |
* | | Merge branch 'tb/commit-graph-object-dir' | Junio C Hamano | 2020-02-14 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | commit-graph.h: store an odb in 'struct write_commit_graph_context' | Taylor Blau | 2020-02-04 | 1 | -1/+1 | |
* | | | Merge branch 'js/patch-mode-in-others-in-c' | Junio C Hamano | 2020-02-05 | 1 | -2/+6 | |
|\ \ \ | ||||||
| * | | | commit --interactive: make it work with the built-in `add -i` | Johannes Schindelin | 2019-12-22 | 1 | -2/+6 | |
* | | | | Merge branch 'hw/commit-advise-while-rejecting' | Junio C Hamano | 2020-01-23 | 1 | -0/+1 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | commit: honor advice.statusHints when rejecting an empty commit | Heba Waly | 2019-12-19 | 1 | -0/+1 | |
| |/ / | ||||||
* | | | Merge branch 'am/pathspec-from-file' | Junio C Hamano | 2019-12-25 | 1 | -0/+3 | |
|\ \ \ | ||||||
| * | | | commit: forbid --pathspec-from-file --all | Alexandr Miloslavskiy | 2019-12-18 | 1 | -0/+3 | |
* | | | | Merge branch 'rs/commit-export-env-simplify' | Junio C Hamano | 2019-12-16 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | commit: use strbuf_add() to add a length-limited string | René Scharfe | 2019-12-09 | 1 | -1/+1 | |
* | | | | | Merge branch 'am/pathspec-from-file' | Junio C Hamano | 2019-12-10 | 1 | -4/+21 | |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | ||||||
| * | | | commit: support the --pathspec-from-file option | Alexandr Miloslavskiy | 2019-11-20 | 1 | -4/+21 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'pw/post-commit-from-sequencer' | Junio C Hamano | 2019-11-10 | 1 | -22/+0 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | move run_commit_hook() to libgit and use it there | Phillip Wood | 2019-10-16 | 1 | -22/+0 | |
| * | | Merge branch 'ds/close-object-store' into maint | Junio C Hamano | 2019-07-29 | 1 | -2/+3 | |
| |\ \ | | |/ | |/| | ||||||
* | | | wt-status: convert struct wt_status to object_id | brian m. carlson | 2019-08-20 | 1 | -2/+2 | |
* | | | Merge branch 'ra/cherry-pick-revert-skip' | Junio C Hamano | 2019-07-19 | 1 | -5/+8 | |
|\ \ \ | ||||||
| * | | | cherry-pick/revert: advise using --skip | Rohit Ashiwal | 2019-07-02 | 1 | -5/+8 | |
| |/ / | ||||||
* | | | Merge branch 'ds/commit-graph-incremental' | Junio C Hamano | 2019-07-19 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | commit-graph: create options for split files | Derrick Stolee | 2019-06-20 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'jh/status-aheadbehind' | Junio C Hamano | 2019-07-10 | 1 | -1/+18 | |
|\ \ \ | ||||||
| * | | | status: ignore status.aheadbehind in porcelain formats | Jeff Hostetler | 2019-06-21 | 1 | -4/+6 | |
| * | | | status: add status.aheadbehind setting | Jeff Hostetler | 2019-06-21 | 1 | -1/+16 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'nd/switch-and-restore' | Junio C Hamano | 2019-07-10 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | doc: promote "git restore" | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -1/+1 | |
* | | | | Merge branch 'ds/commit-graph-write-refactor' | Junio C Hamano | 2019-07-10 | 1 | -2/+3 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||||
| * | | commit-graph: collapse parameters into flags | Derrick Stolee | 2019-06-12 | 1 | -1/+1 | |
| * | | commit-graph: return with errors during write | Derrick Stolee | 2019-06-12 | 1 | -2/+3 | |
* | | | Merge branch 'pw/clean-sequencer-state-upon-final-commit' | Junio C Hamano | 2019-05-13 | 1 | -2/+1 | |
|\ \ \ | ||||||
| * | | | commit/reset: try to clean up sequencer state | Phillip Wood | 2019-04-17 | 1 | -2/+1 | |
| |/ / | ||||||
* | | | Merge branch 'dl/merge-cleanup-scissors-fix' | Junio C Hamano | 2019-05-08 | 1 | -29/+20 | |
|\ \ \ | ||||||
| * | | | merge: add scissors line on merge conflict | Denton Liu | 2019-04-18 | 1 | -5/+17 | |
| * | | | parse-options.h: extract common --cleanup option | Denton Liu | 2019-04-18 | 1 | -1/+1 | |
| * | | | commit: extract cleanup_mode functions to sequencer | Denton Liu | 2019-04-18 | 1 | -23/+2 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'nd/commit-a-with-paths-msg-update' | Junio C Hamano | 2019-04-25 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | commit: improve error message in "-a <paths>" case | Nguyễn Thái Ngọc Duy | 2019-03-22 | 1 | -1/+2 | |
| | |/ | |/| | ||||||
* | | | report_path_error(): drop unused prefix parameter | Jeff King | 2019-03-20 | 1 | -3/+3 | |
| |/ |/| | ||||||
* | | Merge branch 'nd/completion-more-parameters' | Junio C Hamano | 2019-03-07 | 1 | -0/+8 | |
|\ \ | ||||||
| * | | completion: add more parameter value completion | Nguyễn Thái Ngọc Duy | 2019-02-20 | 1 | -0/+8 | |
| |/ | ||||||
* | | Merge branch 'wh/author-committer-ident-config' | Junio C Hamano | 2019-03-07 | 1 | -1/+2 | |
|\ \ | |/ |/| | ||||||
| * | config: allow giving separate author and committer idents | William Hubbs | 2019-02-04 | 1 | -1/+2 | |
* | | Merge branch 'nd/the-index-final' | Junio C Hamano | 2019-02-07 | 1 | -3/+4 | |
|\ \ | ||||||
| * | | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch | Nguyễn Thái Ngọc Duy | 2019-01-24 | 1 | -0/+1 |