repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
built-in rebase: demonstrate regression with --autostash
2018-11-08
Joh
a
nne
s
Schindel
i
n
built-in reba
s
e: demonstra
t
e
r
e
gression with --autosta
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-24
J
ohannes Schind
e
lin
rebase
--
a
utost
a
sh: fix issue with dirty sub
m
odules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-24
Johannes Schindelin
reb
a
se --autostash: demons
t
rat
e
a p
r
oblem with
d
i
rty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-23
Johannes
Schi
n
delin
r
ebase
(
auto
s
tash): use an expl
i
cit OI
D
to apply the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-23
Jo
h
annes Sc
h
indeli
n
rebase (
a
u
to
s
tash): store the full OID in <sta
t
e-dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-23
Johannes Sc
h
in
d
elin
reba
s
e (autostash): avoid duplicate
c
all to s
t
ate_dir_path
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pratik Karki
rebase: default to u
s
ing the builtin rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Joh
a
nnes Schindelin
bu
i
ltin rebase: prepare for builtin rebas
e
-
i
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Junio C Hamano
Merg
e
branc
h
'a
g
/
r
ebase-i-i
n
-c' into js/r
e
base-in-c
.
.
.
commit
|
commitdiff
|
tree
2018-10-11
Pratik
K
arki
builtin rebase: error ou
t
on in
c
ompatible o
p
tion
/
mode
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pratik K
a
rki
b
u
i
l
t
in
r
e
base: use no-op editor when inte
r
active is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Prat
i
k Karki
b
uiltin reba
s
e
: show pro
g
ress wh
e
n connected to
a ter
m
inal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Prati
k
Karki
builtin rebase: fast-fo
r
ward to onto
if it is
a proper
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pratik Karki
builtin r
e
base:
o
ptionally pas
s
c
u
s
tom reflogs to reset_head()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pratik Karki
bu
i
l
t
in rebas
e
: op
t
ionally auto-
d
etect th
e
upstre
a
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pr
a
tik Karki
builti
n
rebas
e
: su
p
port
-
-
root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
P
ratik
K
arki
b
uiltin rebase:
ad
d
support for c
u
stom merge strat
e
gies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
P
r
atik Karki
builtin rebase: sup
p
ort `fork-point` option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pratik
Karki
merge
-
base -
-
for
k
-poi
n
t:
extra
c
t libified fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pratik Ka
r
ki
buil
t
in rebase: s
u
p
p
ort -
-
re
b
ase-me
r
ges
[
=[no-]rebase
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
P
r
atik
Karki
builtin rebase: su
p
port `--
a
llo
w
-emp
t
y-message` o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pr
a
tik Karki
builtin rebase:
s
upport `--exec`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Pratik Kark
i
builtin re
b
ase: support `--a
u
t
ostash
`
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
P
r
atik Karki
b
u
i
l
tin
rebase:
s
u
p
p
ort `-C` and `--whitespace=
<
type>`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-11
Prat
i
k
Ka
r
ki
bui
l
t
i
n rebase:
s
u
pport `--
g
pg
-
sign` opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-09
Al
b
an Gruin
re
b
ase
-
i: move r
e
base--help
e
r modes
t
o rebase--interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-09
Alban Gruin
rebase -i: remove
g
it-rebas
e
--
i
nteracti
v
e
.
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-09
Alban Gruin
rebase--interacti
v
e2:
r
e
w
rit
e
the
s
u
bmodes
of inter
a
c
tive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-09
Alban
G
r
uin
rebase -i:
imple
m
en
t
the main part of in
t
eracti
v
e reb
a
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Prati
k
Karki
builti
n
rebase: s
u
pport `--autos
q
u
ash`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Prat
i
k Karki
b
uiltin rebase: su
p
port
`kee
p
-
e
mpty` opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Prati
k
Kar
k
i
builtin r
e
b
a
se: support `ignore-dat
e
` option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Prati
k
Karki
built
i
n rebase: support `ignore-whitespace` o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
P
r
a
tik
Karki
builtin rebase
:
support --commit
t
e
r
-
date-is-autho
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
P
r
a
t
ik Karki
builtin r
e
ba
s
e: support --rerere-au
t
o
update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pr
a
tik Kar
k
i
bui
l
tin re
b
ase: support --sig
n
off
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Karki
bu
i
ltin rebase: al
l
ow selecting the rebase "b
a
ckend"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Kark
i
b
u
iltin rebase: stop if
`
g
i
t am
`
i
s i
n
pr
o
gress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pr
a
tik Karki
builtin rebase
:
a
ctions require a rebase
in p
r
ogress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Kar
k
i
b
u
iltin rebase: sup
p
ort
-
-
e
dit-todo and --
s
ho
w
-
current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Karki
builtin rebase: s
u
pp
o
rt --qu
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pra
t
i
k
K
ar
k
i
builtin rebase
:
s
u
p
port --abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Karki
b
uiltin re
b
a
se
:
support
--s
k
ip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
P
rati
k
Karki
builtin rebase: support --continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Karki
b
u
iltin rebase: su
p
port `git rebase <u
p
stre
a
m> <switch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Kar
k
i
bu
i
ltin rebase:
o
nly store
f
ully-qualified refs in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
P
r
atik Karki
bu
i
lt
i
n
r
ebase
:
start a new
r
eba
s
e on
l
y i
f
none is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik
Kar
k
i
builtin rebase:
su
p
port --force-
r
e
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pr
a
ti
k
Karki
b
u
il
t
in reba
s
e: try to fast forward when possible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pr
a
tik Karki
builtin reba
s
e: require a cle
a
n worktree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Karki
b
u
iltin reba
s
e:
suppor
t
t
he `verbose` a
n
d `diffs
t
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
P
r
atik Kark
i
buil
t
in rebase: support --quiet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pra
t
ik Ka
r
ki
buil
t
in
r
ebase: handle the pre-rebase hook an
d
--
n
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
P
ratik
K
a
r
ki
b
uiltin rebase: sup
p
ort `gi
t
r
e
base --
o
nto A
.
.
.
B`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-06
Pratik Karki
buil
t
in rebase: support --onto
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-29
Al
b
an Gr
u
in
r
ebase -i: rewrite init_basic_
s
tate() in C
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-29
Alban Gruin
rebase -i: rewrite
w
rite_basic_state() in
C
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-29
Alban
G
ruin
rebase -i: rewrite
the rest of init_revisions_and_shortrevis
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-29
A
l
ban Gruin
rebase -i: imp
l
e
ment the logic to i
n
itialize $revi
s
i
o
ns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-29
Alb
a
n Gruin
re
b
as
e
-i: remove unu
s
ed modes and f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-29
A
lb
a
n
Gruin
reba
s
e -i: rewrite complete_
a
ction() in
C
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alban Gr
u
in
t3404: todo list with commented-ou
t
commands o
n
ly a
b
orts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alban Gruin
seq
u
encer: c
h
a
n
ge the w
a
y
ski
p
_unnecessary
_
picks()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alban Gruin
seq
u
ence
r
: ref
a
ctor a
p
pen
d
_todo
_
help() to w
r
ite
i
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alban Grui
n
r
e
b
ase -i: rewrite
c
heckout_on
t
o
(
) in C
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alban Gruin
rebase -i: rewrite setu
p
_refl
o
g_ac
t
io
n
() in C
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alban Gruin
s
e
q
u
enc
e
r
:
add
a new fu
n
ction to
si
l
ence a
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alb
a
n Gruin
reba
s
e
-i:
r
ew
r
i
t
e the edit-todo functionality in C
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alba
n
Gr
u
in
edito
r
: add a functi
o
n to launch the se
q
uence
e
dit
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
Alban Gr
u
in
r
e
base -i: rewrite append_todo_help() in C
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-10
A
l
ban Gruin
s
equencer: make three fun
c
tions
a
nd a
n
en
u
m
f
rom s
e
q
u
ence
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-06
P
r
at
i
k Karki
builtin
/
rebas
e
: su
p
port run
n
ing "gi
t
rebase <upstream>"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-06
Pratik Karki
reba
s
e
:
r
ef
a
ctor commo
n
shell functions into their
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-06
Pratik Karki
r
ebase: start implementing it
a
s a built
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-02
J
unio C Hamano
Fif
t
h
batch fo
r
2
.
19
c
yc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-02
Ju
n
io C Hamano
Merge branc
h
'jt/c
o
m
m
i
t
-
g
r
a
ph-pe
r
-
object-s
t
ore'
commit
|
commitdiff
|
tree
2018-08-02
Juni
o
C
H
aman
o
Merge
branch 'es/ch
a
in-lint-in-sub
s
h
e
l
l'
commit
|
commitdiff
|
tree
2018-08-02
Ju
n
io C Hamano
Me
r
ge b
r
anch '
j
t/tags-to-p
r
omised-b
l
o
b
s
-fix'
commit
|
commitdiff
|
tree
2018-08-02
Juni
o
C
H
amano
M
erg
e
branch 'jt/fet
c
h-neg
o
t
iator-sk
i
pping'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Hamano
Merge b
r
anc
h
'jm/send-em
a
il-tls-
a
uth-on
-
batch'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Ha
m
ano
Merge b
r
anch 'bc/sequence
r
-export-work-tr
e
e-a
s
-well'
commit
|
commitdiff
|
tree
2018-08-02
Juni
o
C H
a
mano
Merg
e
branch 'en/t7405-recursive-sub
m
odule-conflic
t
s'
commit
|
commitdiff
|
tree
2018-08-02
Jun
i
o C Ham
a
no
M
e
rge branch 'en/t6036-merge-recursive-tests'
commit
|
commitdiff
|
tree
2018-08-02
J
unio
C H
a
mano
Merge
b
ranch 'en/dirty-
m
er
g
e-fi
x
es'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Haman
o
Mer
g
e branch 'js/reba
s
e-mer
g
e
-
octopus'
commit
|
commitdiff
|
tree
2018-08-02
Junio C
H
a
m
ano
Merge
bran
c
h 'tb/grep-only-m
a
tching
'
commit
|
commitdiff
|
tree
2018-08-02
Junio C
H
ama
n
o
Merge bran
c
h
'
kg/gc-auto-windows-workaround
'
commit
|
commitdiff
|
tree
2018-08-02
Juni
o
C
Hamano
Merge
b
ranch 'jm/
c
a
che-entry-from-
m
em-pool'
commit
|
commitdiff
|
tree
2018-08-02
Jun
i
o
C
Hamano
Merge
branch 'jt/fetch-n
e
go-tip'
commit
|
commitdiff
|
tree
2018-08-02
Junio C
Haman
o
M
e
rge
branch 'en/t604
2
-
i
nsane-merge-re
n
ame-testcas
e
s'
commit
|
commitdiff
|
tree
2018-08-02
J
u
n
i
o C
H
a
mano
Merge bran
c
h
'sb/object
-
store-lo
o
ku
p
'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Hamano
Merge branch 'is
/
p
a
r
sing-line
-
range'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Ham
a
n
o
Merge branch 'jt/fetc
h
-pack-nego
t
iator'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Hama
n
o
Merg
e
branch 'a
b
/ch
e
ckout-default-
r
emot
e
'
commit
|
commitdiff
|
tree
2018-08-02
Juni
o
C H
a
mano
Merge branch
'
sb/d
i
f
f-color-
m
ove-m
o
re'
commit
|
commitdiff
|
tree
2018-08-02
Junio C
Hama
n
o
Me
r
ge branch 'es/test-fixes'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Hamano
Merge br
a
nch 'ds/commit-graph-fsc
k
'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Hamano
Me
r
g
e
branch 'jk/fsck-gitmodules-ge
n
tly'
commit
|
commitdiff
|
tree
2018-08-02
Jun
i
o
C
Hamano
M
erge bra
n
ch 'bc/
o
bject-id
'
commit
|
commitdiff
|
tree
2018-08-02
Junio C Hamano
M
e
rge branch 'en/t6036-recursive-
c
orner-c
a
ses'
commit
|
commitdiff
|
tree
next