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 'jk/info-alternates-fix' into maint
2017-11-06
Stefan Bel
l
er
conf
i
g: documen
t
blame conf
i
guration
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-26
Stefan Be
l
le
r
dif
f
.
c
:
get rid of duplicate impleme
n
t
a
tion
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-26
S
t
e
f
an
Beller
xdiff-i
n
terface: export co
m
p
a
rin
g
a
nd
h
a
shing str
i
n
gs
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-07
Stefa
n
Beller
tests:
f
ix di
f
f order arguments i
n
test_cmp
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-04
Stef
a
n Beller
branch:
r
e
set instea
d
of rel
e
ase a strbuf
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-28
Stefan Beller
submodule: correct error message for missin
g
commits
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-28
Stefan Beller
d
iff: correct newli
n
e in
summary for renamed files
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-27
Stefan Belle
r
t7406: submod
u
le
.
<n
a
m
e
>
.
update com
m
and
mu
s
t not
be
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-24
Stefan Beller
Documentation/co
n
fig: clar
i
fy the meani
n
g of submodule
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-22
Stefan Belle
r
Doc
u
ment
a
tion/githooks:
mention merge in commit-m
s
g
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-14
Stefan B
e
ller
re
p
lac
e
-
objects: evaluate replacement
r
efs with
o
ut
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-14
Stefan Beller
push, fetch: erro
r
o
ut for submodule entries not
p
ointing
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-08
S
t
efan Beller
built
i
n/
m
e
r
ge: honor
commit-
m
s
g
h
oo
k
for merges
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-17
Stefan Beller
submo
d
ule
.
sh:
r
e
move unused variable
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-15
S
tefan
Beller
sha1_file: make read_info
_
a
l
t
e
r
na
t
es
stat
i
c
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-10
Stefan Beller
t1200
:
re
m
ov
e
t
1
200-tutorial
.
s
h
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-26
Stefan Beller
t8008
:
rely on rev-parse'
d
HEAD
inste
a
d of
sha1 value
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-13
St
e
fan
Beller
tag: co
n
vert gpg_verify_tag to use st
r
uct object_id
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-13
Stefan
B
e
l
ler
commit: convert lookup_commit_graft to
s
t
ruct object_id
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Beller
t/helper/test-hashmap: u
s
e
custom data instea
d
o
f d
u
p
l
icate
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Ste
f
a
n
Beller
na
m
e-hash
.
c
: dr
o
p
hashmap_c
m
p
_fn
ca
s
t
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Ste
f
a
n
Belle
r
sub
m
odule-config
.
c: dr
o
p hashmap_cmp_fn
c
ast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
S
tefan Beller
remote
.
c
:
drop hashmap_
c
mp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan
Beller
p
atch-
i
ds
.
c: d
r
op hashmap_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
S
tefan Beller
c
onvert
/
sub-pro
c
ess: drop cast to h
a
shma
p
_cmp
_
fn
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Bel
l
er
co
n
fig
.
c: drop h
a
shmap_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan
Bel
l
er
builtin/describe: dr
o
p hashma
p
_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
St
e
fan Bell
e
r
builtin/difftool
.
c
: dro
p
hashm
a
p_c
m
p
_
fn ca
s
t
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Bel
l
er
attr
.
c:
drop hashm
a
p_c
m
p_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
efan B
e
ller
diff: document the new --color-moved setting
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n B
e
ller
diff
.
c: add dim
m
i
n
g
to moved
l
ine detection
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n Beller
d
i
ff
.
c: color mov
e
d
l
i
ne
s
differently
,
p
lain mode
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
St
e
fan Be
l
ler
d
i
f
f
.
c
: color
moved lin
e
s differentl
y
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Belle
r
diff
.
c: buffer all
o
utpu
t
if
ask
e
d
to
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan
Beller
diff
.
c: emit_diff_symb
o
l lea
r
n
s
about DIFF_SYMBOL_S
U
MMA
R
Y
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
tefan Beller
diff
.
c: emit_dif
f
_symbol learns about DIFF_SYMBOL_ST
A
T_SEP
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: convert wo
r
d diffing to use e
m
it_d
i
ff_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
St
e
fan Beller
diff
.
c: con
v
ert show_stats to use emi
t
_diff_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Ste
f
an B
e
ller
diff
.
c:
convert emit_binary_diff_body
to use emit_diff_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Ste
f
an B
e
ller
submodule
.
c
:
m
igrate
diff outp
u
t to use emit_diff_
s
ymbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
efan Beller
diff
.
c: e
m
it_di
f
f_symb
o
l learns DIFF_
S
YMBO
L
_REW
R
I
TE_DIFF
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan B
e
ller
diff
.
c: em
i
t_diff_sy
m
bol
l
ear
n
s ab
o
ut
D
I
F
F
_SYMBOL
_
BINARY_FILES
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: emit_dif
f
_
s
ymb
o
l l
e
arns DIFF_SY
M
BOL_HEADER
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: emit_diff_s
y
mbo
l
lea
r
ns
DIF
F
_SYMBOL_FILEPAIR_
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
St
e
fan
Beller
diff
.
c
:
emit_diff_symbo
l
lea
r
ns DIFF_SY
M
B
OL
_
CONTEXT_INCOMPLETE
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Bel
l
er
diff
.
c: emit_d
i
ff_sym
b
ol
learns DIFF_S
Y
MBOL_WORDS[_PO
R
CELAIN]
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n Beller
d
i
f
f
.
c: migrate
e
m
it_line_checked to use emit_diff
_
s
y
mbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
d
iff
.
c
:
e
m
i
t_diff_sy
m
bol lea
r
ns DI
F
F_SYMBOL_NO_L
F
_
EOF
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan
B
el
l
er
diff
.
c:
e
mit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRA
G
INFO
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Be
l
ler
d
iff
.
c
:
emit_diff_symbol lea
r
ns DIF
F
_S
Y
MBOL_
C
O
N
T
EXT_MAR
K
E
R
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Be
l
ler
diff
.
c:
introduce emit
_
d
i
f
f_s
y
mbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: factor
o
ut diff_flush_patch
_
a
l
l_file_pairs
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Be
l
ler
di
f
f
.
c
:
move line
e
ndin
g
c
h
eck into emi
t
_hunk_
h
ead
e
r
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
efan B
e
l
ler
d
i
ff
.
c: re
a
dability fi
x
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefa
n
Beller
h
a
shmap: migrate doc
u
men
t
ation
fr
o
m Do
c
u
m
enta
t
ion/technic
a
l
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Bel
l
e
r
p
a
tch-i
d
s
.
c: use hash
m
ap corre
c
tl
y
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
St
e
fan Beller
hashmap
.
h: compare function
has
ac
c
e
s
s to
a data field
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n Beller
m
e
r
ge
-
recurs
i
ve: use DIFF_X
D
L_SET
m
a
c
ro
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-27
Ste
f
an Be
l
ler
b
u
ilt
i
n/fetch cleanup
:
a
l
wa
y
s set defaul
t
value for
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
Stefan
B
el
l
er
p
ull: optionally rebase
subm
o
dul
e
s (
r
em
o
te
submodule
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
Stefan Beller
builtin/f
e
tch: pa
r
se recurse-s
u
bmodules-def
a
u
l
t at
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
Stefan Beller
bui
l
tin/fet
c
h: fa
c
t
o
r
submodule recurse
p
a
r
sing
out
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-22
S
tefan
Beller
submodules:
o
v
e
rh
a
ul
documentation
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-09
Stef
a
n Beller
t4005:
m
o
de
r
niz
e
style an
d
drop hard coded sha1
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-04
Stefan Bell
e
r
Documentat
i
on/git-
r
m
: correct sub
m
od
u
le
d
escr
i
ption
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefan Belle
r
builti
n
/fetch
.
c: respect 's
u
b
module
.
recur
s
e' op
t
i
o
n
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefa
n
Be
l
l
e
r
buil
t
in/push
.
c: respect 'submodule
.
recurse' option
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefan
B
elle
r
bui
l
tin
/
grep
.
c: respect 's
u
bmodul
e
.
recurse' option
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefan Beller
Introduce '
s
ubmo
d
ule
.
recurse' option for worktree
m
a
nipulato
r
s
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-30
Stefan
B
eller
submod
u
le loading:
sepa
r
ate code p
a
t
h
f
or
.
gitm
o
d
u
les
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-30
Stefa
n
Bell
e
r
reset/che
c
kout/read-tree: unify config callback fo
r
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-30
St
e
fan
B
elle
r
submodule test invocation: only pass additional argumen
t
s
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-30
S
t
efan
B
e
l
l
e
r
submo
d
ule
recursing: d
o
not write a config
v
ar
i
able
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-23
St
e
fan B
e
ller
t5531: fix test
de
s
cription
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-18
Stefan Beller
t
5
545: enhance tes
t
c
overage
w
hen no ht
t
p
s
er
v
e
r
is
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-09
Ste
f
an Be
l
ler
dif
f
: enab
l
e indent heuristic by default
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-08
S
t
efa
n
Belle
r
diff: recurse into nested subm
o
dules for i
n
line diff
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-04
Stefan B
e
ller
s
u
bmodule: properly recu
r
se for read-tre
e
and checkout
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-04
Stefan Beller
submodul
e
:
a
void
auto-d
i
scovery in
new
w
orkin
g
t
ree
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-05-04
Ste
f
an Beller
sub
m
o
d
ule_
m
ove_head: reu
s
e child_process
s
truct
u
re
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-24
St
e
fan Beller
b
uiltin/reset: add
--re
c
u
r
se-submodul
e
s switch
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-19
Stefan
Beller
subm
o
dul
e
.
c: submodule_
m
o
v
e_h
e
ad work
s
w
i
th broken
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-19
Stefan B
e
ller
sub
m
odule
.
c: uninit
i
ali
z
ed
s
ub
m
odules are ignored in
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-19
Stefan Be
l
l
er
entry
.
c: submod
u
le
r
ecurs
i
ng: respect fo
r
ce flag corre
c
tly
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-14
Ste
f
an Belle
r
submodu
l
e
--helpe
r
:
fix typo in is_active error message
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-04-02
S
tefan B
e
ller
diff: submodule inline diff to initialize en
v
ar
r
ay
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-30
S
tefan Beller
submodule
.
c:
corre
c
tly hand
l
e nested sub
m
odules in
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-29
Stefan Belle
r
unpa
c
k-trees
.
c
: align submodule error message t
o
the
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-29
Stefan Bel
l
e
r
short sta
t
us:
i
mprov
e
r
eporting for submod
u
le chang
e
s
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
Stefan Beller
submodule
.
c: stricter che
c
king for sub
m
odules in is_submodul
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
St
e
f
a
n Beller
submodule
.
c
: port
is_subm
o
dule_modifi
e
d to use porcelain 2
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
Stefa
n
Beller
submodule
.
c:
conv
e
r
t is_submo
d
ule_m
o
d
i
fied to use
s
trbuf_get
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
S
tefa
n
Beller
sub
m
odule
.
c: factor ou
t
e
ar
l
y
loo
p
termina
t
ion in i
s
_submodu
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-27
S
t
efan B
e
ller
subm
o
dule
.
c: use argv_array in is_submodu
l
e_m
o
dified
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-22
Stefan Bell
e
r
builtin/describe: introdu
c
e --b
r
oken flag
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-22
Stef
a
n Belle
r
t3600:
rena
m
e tes
t
t
o describe its functionali
t
y
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-17
St
e
fan Be
l
ler
wt-status: simplify
b
y using for_
e
a
c
h_st
r
in
g
_list_ite
m
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-16
Stefan Beller
b
uiltin/r
e
ad-tree: a
d
d --recurse-submo
d
ules switch
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-16
Ste
f
an Belle
r
builtin/checkout: add
-
-recurse-submodules switch
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-03-16
Stefan Beller
e
n
try
.
c
: cre
a
te submodules
w
hen
i
nteresting
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
next