repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/range-diff-colors'
2018-08-29
Thomas G
u
mmere
r
.
gi
t
attri
b
utes: add
c
o
nflict-ma
r
ker-size for relevant
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
r
e
r
e
re: rec
a
lculate conflict
ID w
h
en unresolved conflict
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rerere: tea
c
h rerere
t
o hand
l
e nested conflicts
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
G
ummer
e
r
rer
e
re: return
s
trb
u
f f
r
om
h
an
d
le
p
a
th
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
mas Gummerer
rer
e
re: f
a
cto
r
ou
t
h
a
ndle_confl
i
ct fu
n
ct
i
on
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Tho
m
as Gu
m
m
e
rer
rerer
e
: onl
y
re
t
u
rn whether a p
a
th has
c
on
f
licts or not
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rerere: fix cras
h
with files rerere
can't
handle
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thoma
s
Gum
m
erer
rer
e
re
:
add docume
n
tatio
n
for conflict normalization
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
G
ummerer
r
erere:
mark strings fo
r
trans
l
a
t
io
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gummerer
rerer
e
:
wra
p
paths in output
i
n sq
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
T
h
o
m
as
G
ummer
e
r
rerere: lowercase er
r
o
r
messages
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gummerer
re
r
e
r
e: unify
erro
r
messages w
h
e
n read_c
a
che fails
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gummerer
note git-security@googlegr
o
ups
.
com i
n
more
places
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gummerer
SubmittingPatches: r
e
place numb
e
red attributes with
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thomas
G
u
mmerer
w
o
r
kt
r
ee: teach "ad
d
" to chec
k
o
u
t existi
n
g branches
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thomas Gummerer
workt
r
ee: factor o
u
t dwim
_
b
r
anch fun
c
tion
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thom
a
s G
u
mmerer
w
o
rktree:
i
mprove mess
a
g
e when creating a
n
ew worktr
e
e
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Th
o
m
a
s Gu
m
merer
worktree: remove extra members
f
ro
m
st
r
uct add_opts
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
T
homa
s
Gummerer
c
o
mpletion: make stash -p an
d
a
l
i
a
s
f
or stash pus
h
-p
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Tho
m
as Gummerer
completion: stop s
h
owing 'save' fo
r
st
a
sh by default
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-12
Thomas Gummere
r
SubmittingPatche
s
: mentio
n
the gi
t
c
ontacts com
m
a
n
d
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gummerer
g
i
t-s
t
a
s
h
.
txt: remove extra square bracke
t
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-21
Thomas Gumme
r
e
r
stash:
d
rop superfluos
p
a
t
h
spec parameter
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-20
Thomas Gummerer
stash
push -u: don't create empty stash
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-20
Thom
a
s Gummerer
stash pu
s
h: av
o
id pri
n
ting er
r
ors
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-02-02
Thoma
s
Gummerer
r
e
s
et
-
-
hard: make u
s
e of the pretty mach
i
nery
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gummerer
tra
v
is: run tes
t
s
w
i
th GIT_TEST_SP
L
IT_INDE
X
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gummerer
split-index: don't write cache
t
ree with null
o
id e
n
tries
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas G
u
mmerer
read-cache: f
i
x
r
eading th
e
shared index for other
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-08
T
h
om
a
s
G
ummerer
oidset:
d
on't retur
n
va
l
ue
from oidset
_
init
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-08
Thomas Gumm
e
rer
stash: don't delete untr
a
cked files that m
a
tc
h
p
athspec
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-12-06
Thomas Gummerer
add
worktree
.
gues
s
Remote config option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-12-06
T
homa
s
Gummerer
worktree: add --guess-remote flag to add subco
m
mand
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gumm
e
re
r
t/README:
document test_cmp_rev
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
t/READM
E
:
remove mentio
n
of adding
co
p
yright notices
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas
Gumme
r
er
w
orktr
e
e: make a
d
d <path> <b
r
a
nch> dwim
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gum
m
erer
worktre
e
: add --[
n
o
-]tr
a
ck option
to the add
s
ubcomman
d
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas G
u
m
m
e
rer
workt
r
ee: add ca
n
b
e crea
t
ed from
any
comm
i
t-ish
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thoma
s
Gummerer
checkout: fact
o
r ou
t
functions to new lib file
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thoma
s
Gum
m
er
e
r
stas
h
: r
e
m
o
v
e
now sup
e
r
fluos he
l
p for
"
s
t
as
h
push"
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thoma
s
Gum
m
erer
stash: mark "g
i
t sta
s
h
s
a
ve" de
p
recated in th
e
man
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thomas G
u
m
m
erer
s
tash:
r
eplace "git stash save" with "git stash push
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-04
Thomas Gummerer
h
t
t
p-pu
s
h
:
fix c
o
n
s
tructio
n
of hex
v
alu
e
from pa
t
h
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-09-14
Thomas Gu
m
me
r
er
refs:
strip out
n
ot allowed
flags
from r
e
f_transaction_
u
pdat
e
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-09-08
Thoma
s
Gumme
r
er
rea
d
-cache: fix
index corrupt
i
on with index
v
4
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-05-17
Thom
a
s
G
umme
r
er
comp
l
e
tion: ad
d
git
s
tash push
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thomas Gummerer
stash:
k
e
ep untracked files intact in stash -k
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Th
o
mas Gummerer
stash:
p
a
ss the pa
t
hspec argument to g
i
t r
e
s
e
t
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thomas Gummerer
stash:
d
on't sh
o
w
internal implementa
t
io
n
details
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thomas
G
ummere
r
stash: allow pat
h
specs
in th
e
no verb for
m
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
T
hom
a
s
Gummerer
stash: use stash_push
for no
v
e
rb form
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thomas G
u
mmerer
s
t
ash
:
t
each
'push'
(
and 'create_st
a
sh
'
) to honor p
a
t
h
spec
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
Thom
a
s
Gum
m
ere
r
s
tash: ref
a
ctor st
a
sh_create
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
Tho
m
a
s
Gummerer
stash
:
ad
d
t
e
st
f
o
r
the cre
a
te command
l
ine ar
g
u
ments
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
T
h
omas Gum
m
erer
stash: i
n
tr
o
d
uce
p
u
sh verb
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-13
Thomas
Gum
m
erer
Docum
e
ntati
o
n/stash:
remove menti
o
n of gi
t
reset -
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-15
Thom
a
s
G
ummerer
add: modify alrea
d
y added files
w
h
e
n --
c
hmod is giv
e
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-15
Thomas
G
ummerer
re
a
d
-cache: in
t
roduce
chmod_
i
ndex_entry
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-14
Thomas Gummerer
upd
a
te-in
d
e
x
: add test for chmod f
l
ags
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-12
Tho
m
a
s
Gumme
r
e
r
add: doc
u
ment the chm
o
d option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-08-29
Th
o
mas Gumm
e
rer
bl
a
me: fi
x
s
egfau
l
t on untr
a
cked
files
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thoma
s
Gummere
r
remote: use remote
_
is_c
o
nfigured() for ad
d
a
n
d rename
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Tho
m
a
s
G
u
mmerer
remote: actually check if remote exits
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
T
h
om
a
s
Gummerer
r
emote: simplify remote_is_con
f
igure
d
()
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thomas
G
u
m
merer
remote: use pars
e
_conf
i
g_k
e
y
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Th
o
ma
s
Gummerer
ls-re
m
ote:
ad
d
su
p
por
t
for showing symre
f
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thomas Gummerer
ls-re
m
ote: use p
a
r
s
e
-
optio
n
s api
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thoma
s
Gummerer
ls-re
m
ote:
fix
synopsis
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Th
o
mas Gummerer
l
s
-r
e
m
ote: docume
n
t --refs option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
T
homas Gumm
e
rer
ls-r
e
m
o
te:
document
-
-quiet option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-12
T
hom
a
s Gummerer
builtin
/
grep: add g
r
ep
.
f
a
llbac
k
ToNo
I
ndex config
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-11
Th
o
mas Gummerer
t7810:
c
orrect
-
-no-index t
e
s
t
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Tho
m
as G
u
mmerer
t1501
:
fix test with split ind
e
x
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-20
T
homas Gummerer
r
ea
d
-cache: fix rea
d
ing of split inde
x
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-20
Th
o
ma
s
Gummere
r
t
1700: make test pa
s
s with in
d
e
x
-v4
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Thom
a
s Gum
m
erer
read-cache: add
ind
e
x
.
versi
o
n config varia
b
le
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gummerer
test-li
b
:
a
l
l
ow setting
t
he index
f
ormat
versio
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gu
m
merer
intr
o
duce GIT_INDEX_VERSION environment variable
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-16
Thomas Gu
m
merer
diff: avoi
d
som
e
nesting
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-16
Thomas Gu
m
m
e
rer
diff: add test for --no
-
index executed outside repo
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-12
Thomas Gum
m
e
r
e
r
d
iff: don't
read
i
ndex when --no-inde
x
is
given
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-12
Thomas Gummerer
diff: m
o
ve no-ind
e
x detectio
n
to b
u
iltin/diff
.
c
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-08-20
Th
o
mas G
u
mmerer
re
a
d-cache: use f
i
xed width integer types
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-06-30
Thomas Gummere
r
perf-
l
ib: fix start
/
sto
p
of perf tests
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-05-22
Thomas
G
ummerer
pr
o
mpt:
fix show u
p
s
tream wit
h
sv
n
a
n
d zsh
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2012-07-11
Thomas Gu
m
merer
S
trip
n
a
mele
n
out of ce_fla
g
s i
n
t
o
a
c
e
_namelen field
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2012-07-09
Thomas Gumm
e
rer
Replace strle
n
() with ce_namelen()
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree