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
rebase: use the new git-rebase--preserve-merges.sh
2018-06-01
A
lban Gruin
rebase: use the new
g
it-
r
eba
s
e--preser
v
e-mer
g
es
.
s
h
commit
|
commitdiff
|
tree
2018-06-01
Alban Gr
u
in
reba
s
e: strip un
u
sed c
o
de in git-rebase--preserve-mer
g
es
.
sh
commit
|
commitdiff
|
tree
2018-06-01
Alban Gru
i
n
rebase: int
r
oduce a dedicated backend for
-
-preserve
.
.
.
commit
|
commitdiff
|
tree
2018-05-06
J
ohann
e
s Sc
h
indelin
rebase --rebase-
m
erges: root co
m
mits can be cous
i
ns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-06
Johannes
S
chin
d
elin
rebase --rebase
-
merges: a "merge" into a n
e
w root is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-06
Joha
n
nes Schindelin
se
q
uencer: al
l
ow intr
o
d
ucin
g
n
e
w
root
co
m
mits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-06
Jo
h
annes
Schindelin
reba
s
e -i --root:
let the sequencer handle even
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-06
J
ohannes Schindelin
sequencer: learn abo
u
t the s
p
ec
i
al "fak
e
root
c
ommi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-06
Johannes Schind
e
lin
se
q
uencer: extr
a
ct helper to update active_cach
e
_tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johannes S
c
h
i
ndelin
rebas
e
-i --r
e
b
a
se
-
mer
g
es: add a sect
i
o
n
to the man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Jo
h
annes Schindel
i
n
rebase
-
i
:
introduce -
-
reb
a
se-merges=[n
o
-]rebase-
c
o
u
s
i
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Jo
h
ann
e
s Schinde
l
in
pull: accept --reba
s
e
=
mer
g
es to recreate the bra
n
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schin
d
elin
re
b
a
s
e --rebase-merges: avoid
"
empty mer
g
es"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Jo
h
a
n
nes
Sch
i
ndelin
seq
u
e
ncer: handle
post-rewri
t
e for merge commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johannes
Schindeli
n
sequencer: make refs generated by the `l
a
bel` c
o
m
m
an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Phillip Wood
r
e
base --rebase-mer
g
es: ad
d
test for --keep-em
p
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johannes
S
c
h
i
nd
e
l
in
rebase:
int
r
oduce the
-
-r
e
ba
s
e-merges opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schi
n
delin
reb
a
se-helper --ma
k
e-script:
i
ntroduce a
f
lag t
o
reb
a
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schindelin
s
e
quenc
e
r: fast-f
o
rward `
m
erge
`
c
omma
n
ds, if
p
ossible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Joha
n
nes Sch
i
nd
e
lin
sequ
e
ncer:
int
r
od
u
ce the `merge` c
o
mmand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Sch
i
ndelin
sequencer: introduce new commands to reset
the revision
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
St
e
fan Beller
g
i
t-rebase--intera
c
tive: clarify arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
J
o
ha
n
nes Schindelin
sequencer: offer helpful advice when a command was
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Joha
n
nes Schindelin
sequencer: refact
o
r how ori
g
ina
l
t
odo list lines are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schi
n
delin
s
e
que
n
ce
r
: mak
e
rearrange_
s
quas
h
() a b
i
t more obvious
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-26
Johan
n
es Schindelin
sequencer: avoid using errn
o
c
l
o
bber
e
d
by
r
ollback_l
o
ck_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-25
Jun
i
o C
Ham
a
no
T
he fou
r
t
h batch f
o
r 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-25
Junio C Ha
m
ano
Mer
g
e
b
ranch
'
jm/m
e
m-pool'
commit
|
commitdiff
|
tree
2018-04-25
J
u
ni
o
C Hamano
M
e
rge branch 't
g
/use-g
i
t-contacts'
commit
|
commitdiff
|
tree
2018-04-25
J
unio C Hamano
Merg
e
branch 'sb/filenames-with-das
h
es'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge bran
c
h 'cc/per
f
-bisect'
commit
|
commitdiff
|
tree
2018-04-25
J
unio C H
a
mano
Me
r
g
e branch 'bp/fsmon
i
tor
-
prime-
i
ndex'
commit
|
commitdiff
|
tree
2018-04-25
Juni
o
C Hamano
Me
r
ge branch 'bp/
f
smonitor-bufs
i
ze-fix'
commit
|
commitdiff
|
tree
2018-04-25
Junio
C Hamano
Merg
e
branch 'cb/bash-
c
ompletion-ls-f
i
le
s
-processi
n
g
'
commit
|
commitdiff
|
tree
2018-04-25
Ju
n
i
o
C Hamano
M
erge
b
ranch
'
e
s/worktree-docs'
commit
|
commitdiff
|
tree
2018-04-25
J
u
nio C Hama
n
o
Merge branch 'es/fread-
r
ead
s
-
d
i
r
-
a
u
toconf-fix
'
commit
|
commitdiff
|
tree
2018-04-25
J
unio
C Hamano
Merge b
r
a
n
ch
'
ps/test-c
h
m
ti
m
e-get'
commit
|
commitdiff
|
tree
2018-04-25
J
u
nio C H
a
mano
M
e
rge branch 'js/t540
4
-path-fix'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Ham
a
no
Merge branch 'jk/ref-array-push
'
commit
|
commitdiff
|
tree
2018-04-25
Junio
C
Hama
n
o
Merge branch 'en
/
d
oc-typoes
'
commit
|
commitdiff
|
tree
2018-04-25
J
uni
o
C H
a
m
a
no
Merge branch
'
lw/d
a
em
o
n-log-dest
i
nation'
commit
|
commitdiff
|
tree
2018-04-25
J
unio C Hamano
Merge branc
h
'mn
/
s
end-e
m
ail
-
cred
e
n
t
i
a
l-doc'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
M
e
rge bran
c
h 'ak/bis
e
ct-do
c
-typofix'
commit
|
commitdiff
|
tree
2018-04-25
J
u
nio C
H
a
m
an
o
Merge branc
h
'b
r
/mergetoo
l
s-g
u
i
f
f
y
'
commit
|
commitdiff
|
tree
2018-04-25
J
unio C Ham
a
no
Merge branc
h
'nd/worktree-move'
commit
|
commitdiff
|
tree
2018-04-25
J
u
nio
C
Hama
n
o
M
erge bran
c
h 'ks/branch
-
list-detached-r
e
base-i'
commit
|
commitdiff
|
tree
2018-04-25
J
unio C Hamano
Merge branch 'jk/t5
5
61-missin
g
-
curl'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
M
erge br
a
nch 'b
w
/commit-partial
-
from-subdir
e
ctor
y
-
f
i
x'
commit
|
commitdiff
|
tree
2018-04-25
J
u
nio
C
Hamano
M
erge
branch 'jk/relative-di
r
ectory-fi
x
'
commit
|
commitdiff
|
tree
2018-04-25
Junio C
H
amano
Me
r
g
e
b
ranch 'jk/flockfil
e
-s
t
dio'
commit
|
commitdiff
|
tree
2018-04-25
J
u
nio C Hamano
Merge
branc
h
'pw/rebase-signoff'
commit
|
commitdiff
|
tree
2018-04-25
Junio C
H
amano
Merge bra
n
ch
'
pw
/
rebas
e
-ke
e
p-empty-fixes'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Mer
g
e branc
h
'cb/git-gui-ttk
-
s
tyl
e
'
commit
|
commitdiff
|
tree
2018-04-25
J
u
n
io C Hama
n
o
Merge br
a
nch 'bp/git-g
u
i-
b
i
nd-
k
p
-
e
n
t
er'
commit
|
commitdiff
|
tree
2018-04-25
Junio C
H
am
a
no
Merge bra
n
ch 'bb/git-gui-ssh-key-fi
l
es'
commit
|
commitdiff
|
tree
2018-04-12
Jameso
n
Mi
l
ler
mem-pool: move reusa
b
le parts of memory po
o
l into its
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-12
Thom
a
s Gummerer
Subm
i
ttingPatches: mention th
e
git contacts co
m
man
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-12
Jameson Miller
f
a
s
t-imp
o
rt: i
n
troduce mem
_
pool type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-12
Jameson Mille
r
fast-import:
rena
m
e mem_
p
ool t
y
p
e
to mp
_
b
l
o
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Merge br
a
nch
's
v
n/autho
r
s-prog-2' of git://bogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Stefan Beller
rep
l
ace_object
.
c: ren
a
me t
o
use dash in file nam
e
commit
|
commitdiff
|
tree
2018-04-11
Stefa
n
Beller
s
h
a
1_fil
e
.
c: renam
e
to
use dash in file n
a
me
commit
|
commitdiff
|
tree
2018-04-11
Stefan Beller
sha1_name
.
c
:
r
e
n
am
e
to us
e
dash in file name
commit
|
commitdiff
|
tree
2018-04-11
Stefan Belle
r
exec_cmd: rename to
u
se da
s
h in file name
commit
|
commitdiff
|
tree
2018-04-11
Ste
f
an Beller
uni
c
ode_width
.
h: re
n
ame to use
d
a
sh in fil
e
name
commit
|
commitdiff
|
tree
2018-04-11
Stef
a
n
B
elle
r
write_or_die
.
c: rename
t
o us
e
d
a
shes in file name
commit
|
commitdiff
|
tree
2018-04-11
Ben Peart
fsmonitor
:
for
c
e
index
w
r
ite afte
r
full s
c
a
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Haman
o
R
evert "M
e
rge branch 'en
/
renam
e
-director
y
-detection'"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
B
e
n Peart
fsmonit
o
r: fix incorrect buffer size
w
h
en print
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Christ
i
a
n Couder
t/perf: add
s
cripts
to bisec
t
performa
n
ce regressio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Christian
C
ouder
p
e
r
f/run: add
--subsectio
n
optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ham
a
no
The third batch for 2
.
1
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Merge
branch 'eb/cred
-
helper-ignore-sig
p
ipe'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C Hamano
Merge br
a
n
c
h
'
l
v/tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
mano
M
erge
b
ranch 'pk/test-a
v
o
i
d
-
pip
e
-hiding-exit-status'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C H
a
mano
Merge branch
'rs/sta
t
us-with
-
removed-submodule
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge
b
r
a
nch 'nd/
c
o
m
bined-test-helper'
commit
|
commitdiff
|
tree
2018-04-11
J
unio C Hamano
Me
r
ge b
r
anch 'sb/packfi
l
es-in
-
re
p
ository
'
commit
|
commitdiff
|
tree
2018-04-11
J
unio C
Hamano
Merge branch
'
sb/object-sto
r
e'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Haman
o
Merge branch
'jc/test-must-b
e
-em
p
ty'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
H
amano
Merge branch
'
cc/p
e
r
f-aggre
g
ate-s
o
rt'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ha
m
ano
Merge branch
'
ab/do
c
-hash-brok
e
nnes
s
'
commit
|
commitdiff
|
tree
2018-04-11
J
unio C Hamano
Mer
g
e branch 'b
c
/
h
ash-indep
e
ndent-tes
t
s'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C H
a
m
a
no
Merge branch 'ab/drop-
c
ontrib-examples'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
The second
b
atch
for 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
M
erge br
a
nch 'ys
/
b
i
sect-object-id-miss
i
ng-c
o
nver
s
ion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio C Haman
o
M
erge branch 'y
k
/filter-branch-non-comm
i
ttish-r
e
fs'
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io C
Hamano
M
e
rge bra
n
ch 'nd/trace-with-env'
commit
|
commitdiff
|
tree
2018-04-10
J
u
nio
C
Ha
m
an
o
Merge branch
'
nd/pa
r
seopt-compl
e
tion-more'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
Mer
g
e bra
n
c
h
'ds/bsearch-hash'
commit
|
commitdiff
|
tree
2018-04-10
J
u
nio C
Hamano
Me
r
ge branc
h
'ws
/
rebas
e
-
p
'
commit
|
commitdiff
|
tree
2018-04-10
J
u
n
i
o C
H
amano
Merge branch 'jk/
d
iff-highligh
t
-graph-
f
ix'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Mer
g
e b
r
anch
'
nd
/
remov
e
-ignore
-
env-fie
l
d'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge br
a
n
c
h 'ps/co
n
tains-id-
e
rror-mes
s
ag
e
'
commit
|
commitdiff
|
tree
2018-04-10
Cl
e
mens
B
uch
a
ch
e
r
co
m
plet
i
on: improve ls-fi
l
es fil
t
er performance
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-09
Ju
n
io C Hamano
The first batch for
2
.
18 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
Hamano
Merge bran
c
h 't
g
/stash-untr
a
cked-with-pathspec-fix'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge
b
ranch 'nd/worktr
e
e
-
prune'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge branch 'bc/
o
bject-id'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Hamano
Merge branch 'ma
/
sh
o
rtlog-re
v
p
a
rse'
commit
|
commitdiff
|
tree
next