summaryrefslogtreecommitdiff
path: root/src/rebase.c
Commit message (Expand)AuthorAgeFilesLines
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-19/+19
* checkout: change default strategy to SAFEEtienne Samson2018-03-261-3/+0
* Make sure to always include "common.h" firstPatrick Steinhardt2017-07-031-0/+1
* Merge pull request #4030 from libgit2/ethomson/fsyncEdward Thomson2017-03-221-9/+9
|\
| * git_futils_writebuffer: default only when flags==0Edward Thomson2017-02-281-9/+9
* | rebase: ignore untracked files in submodulesDavid Turner2017-03-031-1/+3
|/
* repository: rename `path_repository` and `path_gitlink`Patrick Steinhardt2017-02-131-3/+3
* giterr_set: consistent error messagesEdward Thomson2016-12-291-12/+12
* rebase: check the result code of rebase_init_mergeJacques Germishuys2016-12-291-1/+1
* git_rebase_init: correctly handle detached HEADDavid Turner2016-12-011-1/+1
* rebase: don't ask for time sortingCarlos Martín Nieto2016-10-061-1/+1
* rebase: change assertion to avoidEdward Thomson2016-06-011-4/+1
* rebase: handle no common ancestor for inmemoryethomson/rebase_inmemory_no_baseEdward Thomson2016-05-031-4/+15
* rebase: correctly finish rebasing detached headsethomson/rebase_detachedEdward Thomson2016-04-211-24/+35
* rebase: handle detached HEADs in `init`Edward Thomson2016-04-211-3/+11
* rebase: plug memory leak in `rebase_alloc`Patrick Steinhardt2016-02-231-10/+12
* rebase: persist a single in-memory indexEdward Thomson2016-02-151-12/+23
* rebase: allow custom merge_optionsEdward Thomson2016-02-111-2/+2
* rebase: introduce inmemory rebasingEdward Thomson2016-02-111-117/+250
* Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-121-2/+2
* Initialize a few variablesCarlos Martín Nieto2015-06-091-1/+1
* rebase: include checkout opts within rebase optsEdward Thomson2015-04-201-14/+6
* rebase: init and open take a rebase_optionsEdward Thomson2015-04-201-114/+118
* rebase: take `checkout_options` where appropriateEdward Thomson2015-04-201-15/+29
* rebase: block rebase_commit with unstaged changesEdward Thomson2015-04-201-20/+30
* rebase: identify a rebase that has not startedEdward Thomson2015-04-201-1/+1
* Plug a few leaksCarlos Martín Nieto2015-03-041-2/+2
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-1/+1
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-11/+12
* rebase: check alloc resultEdward Thomson2015-02-271-0/+1
* Merge pull request #2831 from ethomson/merge_lockCarlos Martín Nieto2015-02-151-6/+9
|\
| * indexwriter: an indexwriter for repo operationsEdward Thomson2015-02-141-22/+8
| * merge-like operations: lock index while workingEdward Thomson2015-02-141-3/+20
* | rebase: `CHECKOUT_SAFE` instead of `FORCE`Edward Thomson2015-02-131-8/+12
* | rebase: allow `NULL` branch to indicate `HEAD`Edward Thomson2015-02-131-2/+16
* | rebase: provide NULL `exec` on non-EXEC operationsEdward Thomson2015-02-131-9/+28
|/
* Check rebase options version on public entry pointsjamill/rebase_opt_ver_checkJameson Miller2015-02-121-1/+3
* Check the result of git_buf_joinpathJacques Germishuys2014-12-301-1/+2
* Plug some leaksJacques Germishuys2014-12-291-1/+2
* notes: move the notes name argumentCarlos Martín Nieto2014-12-061-2/+2
* rebase: updates based on PR commentsEdward Thomson2014-10-261-17/+31
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-19/+21
* rebase: clean up some warnings and memory leaksEdward Thomson2014-10-261-26/+14
* rebase: oid member of operation should be constEdward Thomson2014-10-261-2/+2
* git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+21
* rebase: preload all operationsEdward Thomson2014-10-261-111/+151
* rebase: init/open a git_rebase objectEdward Thomson2014-10-261-234/+276
* git_rebase_next: provide info about the operationEdward Thomson2014-10-261-2/+9
* git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-16/+150
* git_rebase_commit: write HEAD's reflog appropriatelyEdward Thomson2014-10-261-3/+9