Sign in
googlers
/
jrn
/
git
/
94a88e2524a7243fe77d42faa5649e1c38d1b292
/
builtin
/
rebase.c
b4f0038
Merge branch 'en/rebase-backend'
by Junio C Hamano
· 5 years ago
937d143
i18n: unmark a message in rebase.c
by Jiang Xin
· 5 years ago
a6b4709
Merge branch 'ag/rebase-remove-redundant-code'
by Junio C Hamano
· 5 years ago
a0ab37d
Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
by Junio C Hamano
· 5 years ago
8c22bd9
Merge branch 'en/rebase-backend'
by Junio C Hamano
· 5 years ago
240fc04
builtin/rebase: remove a call to get_oid() on `options.switch_to'
by Alban Gruin
· 5 years ago
b5cabb4
rebase: refuse to switch to branch already checked out elsewhere
by Eric Sunshine
· 5 years ago
10cdb9f
rebase: rename the two primary rebase backends
by Elijah Newren
· 5 years ago
2ac0d62
rebase: change the default backend from "am" to "merge"
by Elijah Newren
· 5 years ago
8295ed6
rebase: make the backend configurable via config setting
by Elijah Newren
· 5 years ago
c2417d3
rebase: drop '-i' from the reflog for interactive-based rebases
by Elijah Newren
· 5 years ago
52eb738
rebase: add an --am option
by Elijah Newren
· 5 years ago
8af14f0
rebase: move incompatibility checks between backend options a bit earlier
by Elijah Newren
· 5 years ago
befb89c
rebase: allow more types of rebases to fast-forward
by Elijah Newren
· 5 years ago
93122c9
rebase: fix handling of restrict_revision
by Elijah Newren
· 5 years ago
55d2b6d
rebase: make sure to pass along the quiet flag to the sequencer
by Elijah Newren
· 5 years ago
8a997ed
rebase, sequencer: remove the broken GIT_QUIET handling
by Elijah Newren
· 5 years ago
e98c426
rebase (interactive-backend): fix handling of commits that become empty
by Elijah Newren
· 5 years ago
d48e5e2
rebase (interactive-backend): make --keep-empty the default
by Elijah Newren
· 5 years ago
d8b8d59
Merge branch 'ag/rebase-avoid-unneeded-checkout'
by Junio C Hamano
· 5 years ago
767a9c4
rebase -i: stop checking out the tip of the branch to rebase
by Alban Gruin
· 5 years ago
22a69fd
git-rebase.txt: update description of --allow-empty-message
by Elijah Newren
· 5 years ago
4d92452
Revert "Merge branch 'ra/rebase-i-more-options'"
by Junio C Hamano
· 5 years ago
e0e1ac5
Merge branch 'en/rebase-signoff-fix'
by Junio C Hamano
· 5 years ago
4fe7e43
rebase: fix saving of --signoff state for am-based rebases
by Elijah Newren
· 5 years ago
71a7de7
Merge branch 'dl/rebase-with-autobase'
by Junio C Hamano
· 5 years ago
37c2619
Merge branch 'ag/sequencer-todo-updates'
by Junio C Hamano
· 5 years ago
5d9324e
Merge branch 'ra/rebase-i-more-options'
by Junio C Hamano
· 5 years ago
cae0bc0
rebase: fix format.useAutoBase breakage
by Denton Liu
· 5 years ago
d82dfa7
rebase -i: finishing touches to --reset-author-date
by Junio C Hamano
· 5 years ago
a2dd67f
rebase: fill `squash_onto' in get_replay_opts()
by Alban Gruin
· 5 years ago
0c51181
Merge branch 'js/rebase-deprecate-preserve-merges'
by Junio C Hamano
· 5 years ago
fe28ad8
rebase: add --reset-author-date
by Rohit Ashiwal
· 5 years ago
08187b4
rebase -i: support --ignore-date
by Rohit Ashiwal
· 5 years ago
cbd8db1
rebase -i: support --committer-date-is-author-date
by Rohit Ashiwal
· 5 years ago
ba51d2f
rebase -i: add --ignore-whitespace flag
by Rohit Ashiwal
· 5 years ago
feebd2d
rebase: hide --preserve-merges option
by Denton Liu
· 5 years ago
974bdb0
Merge branch 'bw/rebase-autostash-keep-current-branch'
by Junio C Hamano
· 5 years ago
640f9cd
Merge branch 'dl/rebase-i-keep-base'
by Junio C Hamano
· 5 years ago
917a319
Merge branch 'js/rebase-r-strategy'
by Junio C Hamano
· 5 years ago
bf1e28e
builtin/rebase.c: Remove pointless message
by Ben Wijen
· 6 years ago
d2172ef
builtin/rebase.c: make sure the active branch isn't moved when autostashing
by Ben Wijen
· 6 years ago
414d924
rebase: teach rebase --keep-base
by Denton Liu
· 6 years ago
4effc5b
rebase: fast-forward --fork-point in more cases
by Denton Liu
· 6 years ago
c0efb4c
rebase: fast-forward --onto in more cases
by Denton Liu
· 6 years ago
2b318aa
rebase: refactor can_fast_forward into goto tower
by Denton Liu
· 6 years ago
e1fac53
rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
by Johannes Schindelin
· 6 years ago
e145d99
rebase -r: support merge strategies other than `recursive`
by Johannes Schindelin
· 6 years ago
5efed0e
rebase: fold git-rebase--common into the -p backend
by Johannes Schindelin
· 6 years ago
d5b581f
Drop unused git-rebase--am.sh
by Johannes Schindelin
· 6 years ago
38dac33
Merge branch 'js/rebase-cleanup'
by Junio C Hamano
· 6 years ago
dea6737
Merge branch 'ds/close-object-store' into maint
by Junio C Hamano
· 6 years ago
649cae6
Merge branch 'pw/rebase-abort-clean-rewritten' into maint
by Junio C Hamano
· 6 years ago
8eb5097
Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint
by Junio C Hamano
· 6 years ago
80dfc92
git: mark cmd_rebase as requiring a worktree
by Johannes Schindelin
· 6 years ago
cbea646
rebase: fix white-space
by Johannes Schindelin
· 6 years ago
1eb0a12
Merge branch 'nd/tree-walk-with-repo'
by Junio C Hamano
· 6 years ago
64096fb
Merge branch 'js/rebase-reschedule-applies-only-to-interactive'
by Junio C Hamano
· 6 years ago
f496b06
Merge branch 'nd/switch-and-restore'
by Junio C Hamano
· 6 years ago
88f95e4
Merge branch 'pw/rebase-abort-clean-rewritten'
by Junio C Hamano
· 6 years ago
5cb7c73
Merge branch 'ds/close-object-store'
by Junio C Hamano
· 6 years ago
906b639
rebase --am: ignore rebase.rescheduleFailedExec
by Johannes Schindelin
· 6 years ago
5e57580
tree-walk.c: remove the_repo from fill_tree_descriptor()
by Nguyễn Thái Ngọc Duy
· 6 years ago
ed7f8ac
Merge branch 'js/rebase-cleanup'
by Junio C Hamano
· 6 years ago
c0e78f7
Merge branch 'jk/unused-params-final-batch'
by Junio C Hamano
· 6 years ago
2d511cf
packfile: rename close_all_packs to close_object_store
by Derrick Stolee
· 6 years ago
8feb8e2
Merge branch 'js/rebase-config-bitfix'
by Junio C Hamano
· 6 years ago
4c785c0
rebase: replace incorrect logical negation by correct bitwise one
by Johannes Schindelin
· 6 years ago
d559f50
rebase --abort/--quit: cleanup refs/rewritten
by Phillip Wood
· 6 years ago
d3fce47
rebase: warn if state directory cannot be removed
by Phillip Wood
· 6 years ago
7372eae
rebase: fix a memory leak
by Phillip Wood
· 6 years ago
082ef75
rebase: fold git-rebase--common into the -p backend
by Johannes Schindelin
· 6 years ago
311c00a
Drop unused git-rebase--am.sh
by Johannes Schindelin
· 6 years ago
7ba06bc
Merge branch 'pw/rebase-i-internal'
by Junio C Hamano
· 6 years ago
0b179f3
Merge branch 'nd/sha1-name-c-wo-the-repository'
by Junio C Hamano
· 6 years ago
460bc3c
rebase -i: run without forking rebase--interactive
by Phillip Wood
· 6 years ago
297b1e1
rebase: use a common action enum
by Phillip Wood
· 6 years ago
0ea0847
rebase -i: use struct rebase_options in do_interactive_rebase()
by Phillip Wood
· 6 years ago
73fdc53
rebase -i: use struct rebase_options to parse args
by Phillip Wood
· 6 years ago
3389853
rebase -i: use struct object_id for squash_onto
by Phillip Wood
· 6 years ago
7d3488e
rebase -i: use struct commit when parsing options
by Phillip Wood
· 6 years ago
c44c246
rebase -i: remove duplication
by Phillip Wood
· 6 years ago
0609b74
rebase -i: combine rebase--interactive.c with rebase.c
by Phillip Wood
· 6 years ago
6023c92
rebase: use OPT_RERERE_AUTOUPDATE()
by Phillip Wood
· 6 years ago
28dc09d
rebase: rename write_basic_state()
by Phillip Wood
· 6 years ago
146839c
rebase: don't translate trace strings
by Phillip Wood
· 6 years ago
4f3036c
Merge branch 'ab/drop-scripted-rebase'
by Junio C Hamano
· 6 years ago
fa1b86e
Merge branch 'js/rebase-deprecate-preserve-merges'
by Junio C Hamano
· 6 years ago
d2c4e62
builtin rebase: use oideq()
by SZEDER Gábor
· 6 years ago
7762f44
builtin rebase: use FREE_AND_NULL
by SZEDER Gábor
· 6 years ago
f4a4b9a
checkout: inform the user when removing branch state
by Nguyễn Thái Ngọc Duy
· 6 years ago
9fbcc3d
Merge branch 'js/rebase-orig-head-fix'
by Junio C Hamano
· 6 years ago
d03ebd4
rebase: remove the rebase.useBuiltin setting
by Ævar Arnfjörð Bjarmason
· 6 years ago
427c3bd
rebase: deprecate --preserve-merges
by Johannes Schindelin
· 6 years ago
cbd29ea
built-in rebase: set ORIG_HEAD just once, before the rebase
by Johannes Schindelin
· 6 years ago
eaf8160
built-in rebase: use the correct reflog when switching branches
by Johannes Schindelin
· 6 years ago
e6aac81
built-in rebase: no need to check out `onto` twice
by Johannes Schindelin
· 6 years ago
b3a5d5a
trace2:data: add subverb for rebase
by Jeff Hostetler
· 6 years ago
32ceace
Fix typos in translatable strings for v2.21.0
by Jean-Noël Avila
· 6 years ago
b966813
Merge branch 'js/rebase-i-redo-exec-fix'
by Junio C Hamano
· 6 years ago
Next »