repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase --rebase-merges: root commits can be cousins, too
2018-05-06
Joh
a
nne
s
Schindelin
rebase --rebase-m
e
rges: root commits can be cousins
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-06
J
ohannes Schindelin
r
ebase -
-
reb
a
se
-
merges: a "merge" i
n
t
o
a n
e
w root is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-06
Johannes Sc
h
indelin
seque
n
cer: allow intr
o
ducing new root c
o
m
mits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-06
Johannes
Schin
d
eli
n
reb
a
se -
i
--ro
o
t: let th
e
s
equ
e
ncer ha
n
d
le even the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-06
Johannes Schinde
l
i
n
sequencer: learn
a
bout the special "
f
ake root commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-06
Joh
a
nn
e
s Schindelin
s
e
quenc
e
r: ex
t
ract help
e
r to
up
d
ate active_cache_tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schindelin
reba
s
e -i --re
b
ase
-
merges: add a section to the man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Sch
i
n
d
elin
rebas
e
-i
:
introdu
c
e --re
b
ase-me
r
ges
=
[no-]rebase-cousins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
J
ohannes Sch
i
n
delin
pull: accept --rebase
=
m
erges to recre
a
t
e t
h
e
b
r
anch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schindelin
rebase --re
b
ase-merges: avoi
d
"
e
mpty merges"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
J
ohannes Sch
i
ndelin
s
equencer
:
handle post-rewrite for m
e
rge comma
n
ds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schindelin
sequen
c
e
r: make refs gene
r
a
t
e
d
by the `
l
abel` command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Philli
p
W
ood
rebase --rebase-me
r
ges: add test for --keep-empty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
J
oha
n
nes Schin
d
elin
rebase: i
n
troduc
e
the -
-
rebase
-
merges opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
J
o
h
annes Schindelin
rebase-helper --make-script: introduce a flag to rebase
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schind
e
lin
sequencer: fast-forward `
m
erge` commands,
i
f
pos
s
i
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schi
n
delin
s
e
quencer: introduce the `merg
e
` comma
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schinde
l
i
n
seq
u
encer: introdu
c
e new
c
ommands to res
e
t t
h
e r
e
vision
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Stefa
n
Belle
r
git-rebase--interactive: clarify a
r
g
uments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schinde
l
in
sequencer: o
f
f
er helpful advice whe
n
a command was
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
J
o
hannes Schi
n
d
el
i
n
sequen
c
er: re
f
actor how original todo lis
t
lines are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Sch
i
ndelin
se
q
uen
c
e
r
: m
a
ke re
a
rr
a
nge_squash() a bit more o
b
v
i
o
u
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-26
Johannes Schindel
i
n
s
e
quence
r
: avoid using errno clobbered by rollback_loc
k
_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-25
Jun
i
o
C
Hamano
The fourth batch fo
r
2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge b
r
anch 'jm/me
m
-pool'
commit
|
commitdiff
|
tree
2018-04-25
Jun
i
o C Haman
o
Merge branch
'
tg/us
e
-git-con
t
acts'
commit
|
commitdiff
|
tree
2018-04-25
Junio C
H
amano
M
e
rge branc
h
'
s
b/filenames-wit
h
-dashes
'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Me
r
ge
b
r
a
nch 'cc/perf-
b
i
sect'
commit
|
commitdiff
|
tree
2018-04-25
Junio C H
a
mano
M
e
r
ge branc
h
'bp/f
s
monitor-prim
e
-index
'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge branch 'bp/
f
smonitor-bufsiz
e
-fix'
commit
|
commitdiff
|
tree
2018-04-25
Junio C H
a
m
a
no
Me
r
ge branc
h
'cb/bash-compl
e
tion-ls-files-processi
n
g
'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge bran
c
h
'
e
s/worktre
e
-
d
o
cs'
commit
|
commitdiff
|
tree
2018-04-25
Junio C
H
a
m
a
n
o
Merge branch 'es/fread-read
s
-
d
ir-a
u
toconf-fix'
commit
|
commitdiff
|
tree
2018-04-25
Junio
C
Hama
n
o
Merge branch 'ps/test-chmt
i
m
e
-get'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merg
e
b
r
a
nch 'js/t540
4
-pat
h
-fix'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Ha
m
ano
Merge bran
c
h
'jk/ref-
a
rr
a
y-push'
commit
|
commitdiff
|
tree
2018-04-25
Junio C H
a
m
ano
M
er
g
e
bra
n
ch 'e
n
/doc-typoes'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge branch 'lw/daemon-log-destination'
commit
|
commitdiff
|
tree
2018-04-25
J
unio C Hamano
M
e
rge
branch
'
m
n
/sen
d
-email-credent
i
al-
d
oc'
commit
|
commitdiff
|
tree
2018-04-25
Jun
i
o C Hamano
M
e
rge branch 'ak/bisect-d
o
c-typofix'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
M
e
rge branc
h
'b
r
/mer
g
e
tools-guiffy'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Ham
a
no
Mer
g
e
branch '
n
d/worktree-move'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Ha
m
ano
Merge branch 'k
s
/
b
ranch-list-detache
d
-
r
e
b
ase
-
i'
commit
|
commitdiff
|
tree
2018-04-25
Ju
n
io C
H
a
mano
Merge branch 'jk
/
t5561-missing-curl'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge b
r
a
n
ch
'bw/commit-partial-from
-
subdirectory-f
i
x'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge branch
'jk/relativ
e
-direct
o
r
y-fix'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge branch 'jk/flockfile
-
stdio'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
M
erge
b
r
anc
h
'pw/rebase
-
signoff'
commit
|
commitdiff
|
tree
2018-04-25
Jun
i
o C Hamano
Merge
b
r
a
n
c
h 'pw
/
rebase-keep-empty-f
i
x
es'
commit
|
commitdiff
|
tree
2018-04-25
Junio C Hamano
Merge branch 'cb/git-gui-ttk-style'
commit
|
commitdiff
|
tree
2018-04-25
Ju
n
io C Hamano
Merge branch 'bp/git-gui
-
bind-kp-enter'
commit
|
commitdiff
|
tree
2018-04-25
Junio
C
H
a
man
o
M
e
r
ge
branc
h
'bb
/
gi
t
-
g
ui-ssh
-
key-files'
commit
|
commitdiff
|
tree
2018-04-12
Jameson Miller
mem-pool: m
o
ve reusable parts
o
f memory
p
oo
l
into
i
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-12
T
h
oma
s
Gu
m
merer
S
ubmi
t
t
ingPatches: mention the git
c
ontacts command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-12
J
ameson Miller
f
ast-import: in
t
roduce m
e
m_pool type
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-12
Ja
m
e
s
on Miller
fas
t
-import: renam
e
m
em_pool
ty
p
e to mp_block
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ha
m
ano
Merge branch
'
svn/authors-prog
-
2' of gi
t
://bogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Stefan Beller
replace_ob
j
ect
.
c:
r
e
n
a
m
e
to use dash in fi
l
e name
commit
|
commitdiff
|
tree
2018-04-11
Stefan Bel
l
er
sha1_file
.
c: rename to use dash i
n
file name
commit
|
commitdiff
|
tree
2018-04-11
S
t
efa
n
Beller
s
ha
1
_n
a
me
.
c: rename to us
e
das
h
in fi
l
e
n
ame
commit
|
commitdiff
|
tree
2018-04-11
Ste
f
an Beller
exec_cmd: rename to use
d
ash in file nam
e
commit
|
commitdiff
|
tree
2018-04-11
Stefan Be
l
ler
u
nico
d
e_wi
d
th
.
h: renam
e
to use dash
i
n file na
m
e
commit
|
commitdiff
|
tree
2018-04-11
Stefan Beller
wri
t
e_o
r
_
d
i
e
.
c: rena
m
e to use
dashes i
n
file
n
ame
commit
|
commitdiff
|
tree
2018-04-11
Ben Peart
fsm
o
ni
t
o
r: force index wr
i
te aft
e
r f
u
ll scan
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ha
m
an
o
R
e
vert "Merge branch
'
e
n/rename-dir
e
ct
o
ry-detection'"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Ben Peart
fsmonitor:
fix incorr
e
ct buffer size when printing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
C
h
ristia
n
Cou
d
er
t/perf: add scrip
t
s t
o
bisect
perfo
r
m
ance
regressions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Christ
i
a
n
C
o
u
d
e
r
perf/r
u
n
: add --subsection o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
J
uni
o
C
H
am
a
n
o
The third batch for 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
am
a
n
o
M
e
rge branch 'eb/cred-he
l
per
-
ign
o
re-sigpipe'
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
i
o
C
Ha
m
ano
Merge bra
n
ch 'lv/tl
s
-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
Hamano
M
e
rge branch 'pk/test-avo
i
d-pipe-hiding-
e
xit-st
a
tus'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge bran
c
h '
r
s
/
status-with
-
r
e
move
d
-submodule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
a
mano
Merge bra
n
ch 'nd/combined
-
test
-
helper'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o C Hamano
Merge branch 'sb/pack
f
iles-in-re
p
osit
o
r
y
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
a
m
ano
Me
r
ge branch 'sb/object-store'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Haman
o
Merge
bra
n
ch 'jc/test-mus
t
-be-emp
t
y
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
am
a
no
Merge b
r
anch 'cc/per
f
-aggregate-s
o
rt'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o
C
Ha
m
ano
Merg
e
b
ranc
h
'
ab/doc-
h
ash-brokenness'
commit
|
commitdiff
|
tree
2018-04-11
J
unio C Hamano
Mer
g
e branch 'b
c
/hash-indepen
d
ent-
t
ests'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Mer
g
e
branch 'ab/drop-contrib-exam
p
les
'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C Hamano
The se
c
ond batc
h
f
or 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge br
a
nch 'ys/bisect-object-id-mi
s
sing
-
c
o
nv
e
r
s
i
on
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C Hamano
Merge b
r
a
nch 'yk/
f
i
l
ter-branch-non-committish-ref
s
'
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io
C
Hamano
Merg
e
b
r
an
c
h 'nd/trace-with-env'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
M
e
rge branch 'nd
/
parseopt-completion-more
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge bran
c
h
'ds/b
s
e
arch-hash'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o
C Hamano
Merge branch 'ws
/
reb
a
se
-
p'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C
Ham
a
no
Me
r
ge branch 'jk/diff-hi
g
hlight-graph
-
f
i
x'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
Hamano
Merge bra
n
ch 'nd/remove-ignore
-
e
n
v-fiel
d
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Me
r
g
e
branch 'ps/con
t
ains-id-error-message'
commit
|
commitdiff
|
tree
2018-04-10
Cle
m
ens B
u
c
hacher
completion: improve ls
-
files filte
r
p
e
rfo
r
ma
n
ce
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
Haman
o
The
firs
t
b
a
tch for 2
.
18 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Hamano
M
erge
branch
'
tg/stash-untracked-w
i
th-p
a
t
hs
p
ec-f
i
x'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C Hama
n
o
Merg
e
b
ranch 'nd/wor
k
tre
e
-prune'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ha
m
an
o
Merge bra
n
ch 'b
c
/ob
j
e
c
t-
i
d
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge
branch 'ma/
s
hortlog
-
revparse'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Ha
m
ano
Merge branc
h
'
a
b/install-sy
m
links'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
H
amano
Merge b
r
anch 'ml/filter-branch
-
n
o
-op-erro
r
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Me
r
ge branch 'ab/
p
cre-v2'
commit
|
commitdiff
|
tree
next