Andrew's git / gitweb.git / search
?
rebase (autostash): use an explicit OID to apply the stash
2018-10-23 rebase (autostash): use an explicit OID to apply the...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-23 rebase (autostash): store the full OID in <state-dir...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-23 rebase (autostash): avoid duplicate call to state_dir_path()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 rebase: default to using the builtin rebase
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: prepare for builtin rebase -i
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c...
diff | tree
2018-10-11 builtin rebase: error out on incompatible option/mode...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: use no-op editor when interactive is...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: show progress when connected to a terminal
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: fast-forward to onto if it is a proper...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: optionally pass custom reflogs to reset_head()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: optionally auto-detect the upstream
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: support --root
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: add support for custom merge strategies
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: support `fork-point` option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 merge-base --fork-point: extract libified function
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: support --rebase-merges[=[no-]rebase...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: support `--allow-empty-message` option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: support `--exec`
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: support `--autostash` option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: support `-C` and `--whitespace=<type>`
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-11 builtin rebase: support `--gpg-sign` option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-09 rebase -i: move rebase--helper modes to rebase--interactive
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-09 rebase -i: remove git-rebase--interactive.sh
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-09 rebase--interactive2: rewrite the submodes of interactive...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-10-09 rebase -i: implement the main part of interactive rebase...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support `--autosquash`
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support `keep-empty` option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support `ignore-date` option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support `ignore-whitespace` option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --committer-date-is-author...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --rerere-autoupdate
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --signoff
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: allow selecting the rebase "backend"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: stop if `git am` is in progress
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: actions require a rebase in progress
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --edit-todo and --show-current...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --quit
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --abort
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --skip
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --continue
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support `git rebase <upstream> <switch...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: only store fully-qualified refs in...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: start a new rebase only if none is...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --force-rebase
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: try to fast forward when possible
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: require a clean worktree
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support the `verbose` and `diffstat...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --quiet
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: handle the pre-rebase hook and --no...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support `git rebase --onto A...B`
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-09-06 builtin rebase: support --onto
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-29 rebase -i: rewrite init_basic_state() in C
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-29 rebase -i: rewrite write_basic_state() in C
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-29 rebase -i: rewrite the rest of init_revisions_and_shortrevis...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-29 rebase -i: implement the logic to initialize $revisions...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-29 rebase -i: remove unused modes and functions
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-29 rebase -i: rewrite complete_action() in C
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 t3404: todo list with commented-out commands only aborts
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 sequencer: change the way skip_unnecessary_picks()...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 sequencer: refactor append_todo_help() to write its...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 rebase -i: rewrite checkout_onto() in C
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 rebase -i: rewrite setup_reflog_action() in C
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 sequencer: add a new function to silence a command...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 rebase -i: rewrite the edit-todo functionality in C
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 editor: add a function to launch the sequence editor
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 rebase -i: rewrite append_todo_help() in C
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-10 sequencer: make three functions and an enum from sequencer...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-06 builtin/rebase: support running "git rebase <upstream>"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-06 rebase: refactor common shell functions into their...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-06 rebase: start implementing it as a builtin
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-02 Fifth batch for 2.19 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2018-08-02 Merge branch 'jt/commit-graph-per-object-store'
 diff | tree
2018-08-02 Merge branch 'es/chain-lint-in-subshell'
 diff | tree
2018-08-02 Merge branch 'jt/tags-to-promised-blobs-fix'
 diff | tree
2018-08-02 Merge branch 'jt/fetch-negotiator-skipping'
 diff | tree
2018-08-02 Merge branch 'jm/send-email-tls-auth-on-batch'
 diff | tree
2018-08-02 Merge branch 'bc/sequencer-export-work-tree-as-well'
 diff | tree
2018-08-02 Merge branch 'en/t7405-recursive-submodule-conflicts'
 diff | tree
2018-08-02 Merge branch 'en/t6036-merge-recursive-tests'
 diff | tree
2018-08-02 Merge branch 'en/dirty-merge-fixes'
 diff | tree
2018-08-02 Merge branch 'js/rebase-merge-octopus'
 diff | tree
2018-08-02 Merge branch 'tb/grep-only-matching'
 diff | tree
2018-08-02 Merge branch 'kg/gc-auto-windows-workaround'
 diff | tree
2018-08-02 Merge branch 'jm/cache-entry-from-mem-pool'
 diff | tree
2018-08-02 Merge branch 'jt/fetch-nego-tip'
 diff | tree
2018-08-02 Merge branch 'en/t6042-insane-merge-rename-testcases'
 diff | tree
2018-08-02 Merge branch 'sb/object-store-lookup'
 diff | tree
2018-08-02 Merge branch 'is/parsing-line-range'
 diff | tree
2018-08-02 Merge branch 'jt/fetch-pack-negotiator'
 diff | tree
2018-08-02 Merge branch 'ab/checkout-default-remote'
 diff | tree
2018-08-02 Merge branch 'sb/diff-color-move-more'
 diff | tree
2018-08-02 Merge branch 'es/test-fixes'
 diff | tree
2018-08-02 Merge branch 'ds/commit-graph-fsck'
 diff | tree
2018-08-02 Merge branch 'jk/fsck-gitmodules-gently'
 diff | tree
2018-08-02 Merge branch 'bc/object-id'
 diff | tree
2018-08-02 Merge branch 'en/t6036-recursive-corner-cases'
 diff | tree
2018-08-02 Merge branch 'sg/httpd-test-unflake'
 diff | tree
2018-08-02 Merge branch 'bp/test-drop-caches-for-windows'
 diff | tree
2018-08-02 Merge branch 'jk/has-uncommitted-changes-fix'
 diff | tree