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
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty...
2017-12-05
Stef
a
n Beller
Doc
u
mentation/git
-
clone: improve descr
i
p
t
ion f
o
r
submodule
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-12
S
t
efan Bel
l
er
t/3512:
demonst
r
ate unrel
a
ted su
b
mo
d
ule/file conflict
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-06
Stefan Beller
confi
g
: document blame
configuration
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-26
Stefan Be
l
ler
d
iff
.
c: get
rid of duplic
a
te implem
e
n
tation
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-26
Stefan Be
l
ler
xdiff-i
n
terf
a
ce: ex
p
ort comp
a
ri
n
g a
n
d
h
ashing
s
trings
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-07
Stefan Bell
e
r
tests:
fix d
i
ff order arguments in test_cmp
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-04
Stefan
Be
l
ler
branch: re
s
e
t
in
s
tead of
release
a
strbuf
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-28
S
t
efan Bel
l
er
submo
d
ule:
correct error message for mis
s
ing c
o
mmi
t
s
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-28
Stefa
n
Bel
l
er
diff: correct newlin
e
i
n summary
for renamed files
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-27
Stefan
B
e
ller
t7406
:
su
b
m
odule
.
<name>
.
update c
o
mmand must not be
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-24
Stefan Beller
Docum
e
ntation/co
n
f
i
g
: clarify the
m
eaning of submodu
l
e
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-22
S
tefan Beller
D
ocumentat
i
on/githooks: men
t
ion merg
e
in com
m
it-
m
sg
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-14
Stef
a
n Bel
l
er
r
e
p
lace-objects:
evaluate replacement refs without
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-14
Stefan Beller
push, fe
t
c
h: error
o
ut for
s
ubmodule entries not pointing
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-08
Stefan B
e
l
l
er
bui
l
tin/merge: hono
r
co
m
mit-msg h
o
ok f
o
r merges
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-17
S
t
e
fan Beller
subm
o
d
ule
.
s
h: remove unuse
d
var
i
able
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-15
Stefan Beller
sh
a
1_file
:
make read_in
f
o_a
l
ter
n
ates static
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-10
Ste
f
an Beller
t1200: re
m
ove t
1
200-tu
t
ori
a
l
.
sh
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-28
S
te
f
an
B
ell
e
r
Documentat
i
on/checkout: clarify submo
d
ule H
E
ADs to
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-26
Stefan Be
l
ler
t8008
:
rely on rev-parse'd HEAD inst
e
ad of sha1 v
a
lue
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-25
Stefan Beller
recurs
i
ve submodu
l
es: detach HEA
D
from new state
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-13
St
e
f
a
n B
e
ller
tag: conver
t
gpg_verify_t
a
g to use struct object_id
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-13
Ste
f
an Belle
r
co
m
mit: convert look
u
p_commi
t
_graft to st
r
uct objec
t
_id
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
S
t
ef
a
n Be
l
ler
t/
h
el
p
e
r/test
-
hashmap: use cust
o
m data instead of dupl
i
c
a
te
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
S
t
efan Beller
name-hash
.
c: drop hash
m
ap_cm
p
_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Belle
r
submodule-con
f
ig
.
c: drop ha
s
hmap_c
m
p_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Bel
l
e
r
remote
.
c
:
d
r
op hashmap_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan
Beller
patch-ids
.
c:
d
r
op hashmap_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Belle
r
convert/sub-process:
drop cas
t
to hashmap_cmp_fn
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Belle
r
config
.
c
:
dro
p
h
ashmap_cmp_fn ca
s
t
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
S
t
ef
a
n
B
e
l
ler
builti
n
/d
e
s
crib
e
: drop
hashmap_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
S
t
efan
Beller
builti
n
/difftool
.
c
:
drop has
h
map_cmp_fn cas
t
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Beller
a
t
tr
.
c: drop hashmap_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
tefan Beller
diff: docume
n
t
t
he new -
-
c
o
l
or-
m
oved setting
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
dif
f
.
c: add dimming to mo
v
ed line detection
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n Beller
diff
.
c:
color
mo
v
ed lines
d
ifferently,
plai
n
mode
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Bel
l
er
diff
.
c: color
moved lines d
i
ff
e
rently
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
efan Beller
diff
.
c: buffer a
l
l output if asked to
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c
: emi
t
_diff_sy
m
bol learns
about DIFF_SY
M
BOL_SUMMARY
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Bel
l
er
diff
.
c:
emit_diff_symbol learns about
DIFF_SYMBOL
_
STAT_SE
P
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Ste
f
an Be
l
ler
diff
.
c: convert word
d
iffing to use em
i
t_d
i
f
f_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Belle
r
diff
.
c: conver
t
show_stats to use emit_d
i
f
f_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
e
fan Beller
di
f
f
.
c:
c
o
nvert emit_bina
r
y_diff_
b
ody to us
e
emit_diff_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Belle
r
submod
u
le
.
c: mi
g
rate diff o
u
t
p
ut
to use
emi
t
_
diff_
s
ym
b
ol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c:
emit_dif
f
_symbol
l
ea
r
ns
D
IFF_SYMBOL_REWRITE_DIFF
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan
B
e
l
l
er
d
i
ff
.
c: e
m
it_
d
iff_symbol
l
e
a
rn
s
a
b
out DIFF_SYMB
O
L_
B
INARY_FILES
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n
Be
l
ler
diff
.
c: emit_diff_symbol learns DIFF_SYMBOL_HE
A
DER
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Bell
e
r
d
i
ff
.
c:
e
mit_di
f
f_
s
ymbol learns DI
F
F_SYMBOL_FILEP
A
IR_
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Belle
r
d
i
f
f
.
c: emit_diff_symbol le
a
rns DI
F
F_SYMBOL_CONTEXT
_
INCOM
P
LETE
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: emit_diff_s
y
mbol learns
D
IFF_SYMBOL_
W
OR
D
S[_POR
C
ELAIN]
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
efa
n
B
e
l
ler
di
f
f
.
c: migrate em
i
t_line_ch
e
c
k
ed to use
emit_
d
iff_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Belle
r
d
iff
.
c: emit_
d
iff_sym
b
o
l
learns DIFF_SYMBO
L
_N
O
_
L
F_EOF
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Bel
l
er
d
i
ff
.
c
:
e
m
it_diff_symbol lea
r
ns DIFF_SY
M
BOL_CONTEXT_FR
A
GINFO
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
tefan Beller
diff
.
c: em
i
t_
d
i
f
f_symbol learns DIFF_SYMBOL_CONTEXT_M
A
RKER
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan
B
eller
diff
.
c: int
r
oduce e
m
it_di
f
f_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan B
e
ller
diff
.
c: factor out diff_flush_patch
_
all_file
_
pa
i
rs
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
e
fan Beller
diff
.
c: m
o
ve
l
in
e
ending check
i
nto emit_hu
n
k_hea
d
er
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
tefan
B
ell
e
r
d
i
ff
.
c
: reada
b
ility f
i
x
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
ef
a
n Belle
r
hashmap: migrate document
a
tio
n
f
rom Docum
e
ntat
i
on/techn
i
cal
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
patch-ids
.
c: us
e
hashmap
c
orrectly
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Bel
l
e
r
hash
m
ap
.
h: c
o
mpa
r
e
f
u
nction has access to a
d
ata f
i
eld
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
merge-recursive: use DIFF_XDL
_
SET macro
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-27
S
t
ef
a
n Beller
builtin/fetch c
l
ea
n
up: always set
d
efault v
a
lue for
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
S
t
e
f
an Beller
pull: o
p
t
ionally re
b
as
e
submo
d
ules (remote submod
u
le
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
Stefan
Beller
builtin/fetch: parse recurse
-
submodules-def
a
ult
a
t
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
Stefan Beller
builtin/fetch:
f
actor subm
o
dule recurse
parsing out
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-22
Stefan
Beller
submodules: ove
r
h
aul docum
e
ntation
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-09
Stefan Beller
t4005: modernize st
y
le an
d
d
ro
p
hard cod
e
d sha
1
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-04
Stefan Beller
D
o
c
umentation/g
i
t-
r
m: correct submodule descrip
t
ion
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefan Bel
l
er
b
uiltin/fetch
.
c
:
res
p
e
ct
'su
b
modul
e
.
recurse' option
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefan
B
el
l
er
builtin
/
push
.
c: resp
e
ct 'submodule
.
r
e
curse' option
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
S
tefan Beller
built
i
n/g
r
ep
.
c: respe
c
t
'
submod
u
l
e
.
r
e
c
urse'
option
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
S
t
e
f
a
n
Bel
l
er
Introduce
'
submodule
.
recur
s
e' option fo
r
w
o
rktree manipulators
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-30
Stefan Beller
submodule loading: separate code path for
.
gitmodules
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-30
St
e
f
a
n Be
l
ler
reset/c
h
eckout/re
a
d
-tree: unify conf
i
g
callback
f
or
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-30
Stefan Beller
subm
o
dule t
e
st invocatio
n
: only pass additional
arguments
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-30
Stefan Beller
submodule
r
ecursing:
do no
t
write
a
config variable
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-23
Stefan Beller
t5531: fix
test d
e
s
c
ription
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-18
Stefan B
e
ller
t5545: enhance test coverage when
n
o http server is
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-09
S
t
efan Beller
di
f
f: en
a
ble indent heuristic by defau
l
t
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-08
Stefan Beller
diff: recurs
e
into n
e
st
e
d
submo
d
ules for
in
l
ine
diff
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-04
Stefan Beller
submodule
:
p
roperly recu
r
se for read-t
r
ee and checkout
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-04
Stefa
n
B
e
l
l
e
r
submodule: avoid auto-discovery in new workin
g
tree
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-04
Stefan Beller
s
u
b
m
odul
e
_move
_
he
a
d: reus
e
child_process struc
t
ure
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-24
Stefan
Beller
builtin/res
e
t: a
d
d
--recu
r
s
e
-subm
o
dule
s
switc
h
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-19
S
tefan Belle
r
submodule
.
c: submodule_move
_
he
a
d
w
orks with br
o
k
e
n
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-19
Stefan Beller
submodule
.
c: un
i
nitializ
e
d s
u
bmodules are ignored in
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-19
Stefan Beller
entry
.
c: submodule recursing: respect force flag corr
e
ctly
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-14
Stefan Beller
submodul
e
--helper: fix
ty
p
o in is_
a
c
tiv
e
erro
r
message
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-02
Stefan Bell
e
r
d
i
ff: submodule i
n
line diff to initialize env array
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-30
Stefan Beller
submodule
.
c:
c
orrectly handl
e
ne
s
ted submodules in
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-29
S
t
efan Beller
unpack
-
trees
.
c
: align sub
m
odule error message to the
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-29
S
tefan Beller
short status: im
p
r
ove report
i
ng
f
or subm
o
dule changes
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
S
t
e
fan Beller
submodu
l
e
.
c:
s
tricte
r
c
hecking
for submodules i
n
is_submo
d
u
l
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
Stefan Beller
submodule
.
c
: port is_
s
ubmodule_modified to use porcela
i
n 2
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
Ste
f
a
n Bel
l
er
s
u
b
m
od
u
l
e
.
c
: convert is_s
u
b
module_modified to us
e
strbuf_get
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
S
t
efan Beller
submodule
.
c: fa
c
tor out early loop
termin
a
tion i
n
is_submodu
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
Stefan Beller
submodule
.
c: use
argv_array in is_submodule_modified
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-22
Stef
a
n Beller
builtin/de
s
c
rib
e
: in
t
roduce --broken flag
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-22
Stefan
B
eller
t
3
600: re
n
a
m
e
t
est t
o
d
escribe its f
u
nctionality
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
next