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
rerere: add note about files with existing conflict markers
2018-08-29
Thomas
G
u
mmer
e
r
rere
r
e: add
n
o
te abou
t
files with existing confli
c
t
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-29
T
homas Gummerer
r
e
r
ere: me
n
tion caveat ab
o
ut unmatched conflict markers
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thoma
s
Gummere
r
rerere: rec
a
lculate conflict ID
w
hen un
r
e
s
olved conflict
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
T
h
o
mas Gu
m
merer
r
erere: tea
c
h
rerere to hand
l
e
n
ested conflicts
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
Gummerer
rerere: return
s
t
r
buf from handle path
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
mas Gum
m
erer
rerere: factor out handle
_
conflict
function
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rerere: on
l
y return whethe
r
a pat
h
has
c
on
f
licts o
r
n
o
t
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rer
e
re: fix cras
h
w
it
h
files rerere
c
an't
h
and
l
e
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gumm
e
re
r
rerere: add docume
n
tation for conf
l
i
ct
n
or
m
alization
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thom
a
s Gummerer
rerere:
m
ark st
r
i
ngs
f
or tra
n
slation
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gu
m
me
r
er
re
r
e
re: wrap paths in
output
i
n sq
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Th
o
mas G
u
m
m
erer
rerere: lowerca
s
e error messages
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas
Gumm
e
rer
rer
e
r
e
: unify
e
rror messages
w
hen rea
d
_cache fails
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gumm
e
rer
note
g
it-
s
e
c
urity@googlegroups
.
com in more places
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
T
h
o
mas Gummerer
Submit
t
i
n
gPatc
h
es:
r
eplace numbered a
t
tributes
with
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
T
homas
Gummerer
w
o
rktree: teach
"add" to check out existing branc
h
es
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
T
homas Gumme
r
e
r
w
o
r
k
t
ree: f
a
c
t
or out dwim_branch funct
i
on
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thomas Gummerer
w
o
r
k
tre
e
:
im
p
r
o
ve me
s
s
age whe
n
creating a new worktree
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thoma
s
Gummerer
workt
r
ee: remove extra members from struct ad
d
_
o
pts
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Thomas Gummerer
completion
:
make stas
h
-p
and
alias for stash p
u
sh
-
p
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Thomas Gummerer
complet
i
o
n:
st
o
p showing 'save'
for st
a
sh by
default
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-12
Thomas Gumm
e
rer
Su
b
mitt
i
ngPatches: mention th
e
git
c
o
ntact
s
command
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-28
Thoma
s
Gummer
e
r
gi
t
-stash
.
txt: remove extra square bracket
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-21
Thomas G
u
mmerer
stash: drop su
p
e
r
f
lu
o
s pa
t
hspec paramet
e
r
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-20
Thomas Gummerer
stash
pu
s
h -u:
d
on't create empty
s
tash
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-20
Thom
a
s Gummer
e
r
stash push: avoid prin
t
ing errors
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-02-02
Tho
m
as Gumme
r
er
reset --hard: make
use of
th
e
p
r
etty mach
i
nery
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gum
m
erer
travi
s
:
run t
e
sts with
G
IT_TEST
_
SPLIT_INDE
X
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
T
homas G
u
m
me
r
e
r
split-index: do
n
't
write
c
a
che tree
w
ith null oid entries
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas G
u
mmerer
read-cache: fi
x
r
ea
d
ing
the shared ind
e
x for other
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-08
Thoma
s
Gummerer
o
i
dset: don't retur
n
v
alue from o
i
dset_ini
t
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-08
Thomas Gum
m
er
e
r
stash:
do
n
't
d
e
lete untracked fi
l
es
that
m
atch
pathsp
e
c
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-12-06
Tho
m
as Gummerer
a
dd
w
or
k
tre
e
.
gu
e
ss
R
emote config option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-12-06
Thomas Gummerer
work
t
ree: a
d
d --guess-remote flag to
add s
u
bcommand
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
t
/
R
EAD
M
E: document
t
e
s
t_cmp_rev
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummer
e
r
t
/
REA
D
ME:
r
emove mention of a
d
din
g
copy
r
i
g
ht n
o
t
ices
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas G
u
mmerer
work
t
ree: make add <path> <branch
>
dwim
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
w
orktre
e
:
a
dd --[no-]track
opti
o
n to the add sub
c
ommand
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas
G
umme
r
er
wor
k
t
r
ee: a
d
d can be created from any c
o
mmit
-
ish
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Th
o
mas Gummerer
checkout: fact
o
r out f
u
nctio
n
s to new
l
i
b
file
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Th
o
mas Gummerer
stash:
re
m
o
v
e now s
u
perfluo
s
help
f
or "s
t
ash push"
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
T
h
omas
G
ummerer
s
tash: m
a
rk "git stash save" deprecated in the man
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thomas Gumme
r
er
s
t
ash: repla
c
e
"git stash
s
a
ve" w
i
th
"
git
stas
h
push
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-04
Th
o
mas Gummerer
http-push
:
f
i
x
constru
c
t
i
on of hex value from pat
h
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-09-14
Thomas Gummerer
re
f
s:
st
r
ip out
not allowed fl
a
gs fro
m
ref_transa
c
tion_upd
a
te
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-09-08
Thomas Gumm
e
re
r
read-cache: fix index corrup
t
i
on with ind
e
x v4
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-05-17
Thomas
Gummer
e
r
c
o
m
p
letion:
a
d
d git stash push
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thomas Gumm
e
re
r
sta
s
h:
keep untracke
d
files
intact in
s
tash -k
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thomas Gu
m
m
e
rer
stash: pass the pathspec argumen
t
to git r
e
set
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thomas Gummerer
stas
h
: d
o
n't show internal i
m
plementat
i
on detai
l
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
T
homa
s
Gummer
e
r
stash: allow
pathspecs i
n
th
e
n
o
verb
form
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thomas Gummere
r
s
t
ash:
u
se stash_p
u
sh for n
o
v
e
rb form
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thomas G
u
mmer
e
r
stash
:
t
each
'
push' (a
n
d 'create_st
a
sh') to honor pa
t
hspec
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
Thomas Gummerer
stash: refactor stash_create
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
Thoma
s
Gummerer
stas
h
: ad
d
test
for the create co
m
m
an
d
line argumen
t
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
Thomas
G
ummerer
stash: introd
u
c
e push verb
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-13
T
h
o
m
as Gummerer
Documentat
i
on/stash: re
m
ove ment
i
on of git rese
t
-
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-15
Thoma
s
G
ummere
r
a
dd: modify alre
a
d
y
added f
i
les when
--
c
h
m
od
is
g
iven
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-15
Thomas Gummerer
read-
c
ache:
introduce chmod_index_entry
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-14
T
h
o
mas
Gummerer
update-inde
x
: add
t
est
f
o
r c
h
mod flags
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-12
Th
o
mas Gu
m
merer
add: docume
n
t the
c
hmod option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-08-29
Tho
m
as
G
um
m
er
e
r
blame: fi
x
segfault on un
t
racked files
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Th
o
mas Gum
m
e
rer
remote: use remote_i
s
_configured()
f
or add and rename
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thoma
s
G
u
mmerer
r
e
mote:
a
ctually ch
e
ck if
r
emote exits
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Tho
m
as Gummerer
remote:
s
implify
remote_is_configured()
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thomas Gum
m
erer
remote: use p
a
rse_con
f
ig_key
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
T
h
oma
s
G
u
mmere
r
ls-
r
emote
:
ad
d
support for sho
w
ing symrefs
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thomas G
u
mmerer
ls-r
e
m
o
t
e:
use parse-op
t
ions api
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thom
a
s Gum
m
ere
r
l
s
-re
m
o
te: fix synops
i
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thomas
G
um
m
erer
ls-rem
o
t
e: document --
r
e
f
s opti
o
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thoma
s
Gummerer
ls-r
e
mote: d
o
c
u
m
e
nt --quiet opt
i
on
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-12
Thomas Gummerer
b
u
ilt
i
n/grep: add
g
re
p
.
f
a
ll
b
ackToNoIn
d
ex
config
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-11
Th
o
mas Gummerer
t7810: cor
r
ect --no
-
index test
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Thoma
s
Gummerer
t1501: fix test with split
i
ndex
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-20
Thom
a
s Gu
m
merer
read-cache: fi
x
readi
n
g of
s
plit index
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-20
Thomas
G
u
mmerer
t1700:
m
a
k
e test pass with index-v4
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Th
o
mas Gummerer
r
e
ad-c
a
che: add index
.
ve
r
s
io
n
config
v
ariable
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gummerer
t
est-lib
:
allow
s
ettin
g
t
he inde
x
format version
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
T
h
omas Gummerer
introduce
G
IT_INDEX_VERS
I
ON enviro
n
ment
vari
a
b
l
e
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-16
Thomas Gummerer
diff: avoi
d
some nesting
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-16
Thomas Gummerer
diff: add test
for --no-index exe
c
ut
e
d outside repo
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-12
Thomas Gummerer
dif
f
:
d
on't read index when --no-index
is given
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-12
Thomas Gummerer
d
i
ff: move no-ind
e
x detectio
n
to builtin/diff
.
c
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-08-20
Th
o
mas Gu
m
merer
read-cache: use
f
ixed width int
e
g
e
r
types
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-06-30
Th
o
mas Gummerer
p
e
rf-lib: fix start/stop of
p
erf test
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-05-22
Th
o
mas Gummerer
prompt: fix sh
o
w upstream with svn and zsh
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2012-07-11
Thomas Gummerer
Str
i
p namelen ou
t
of ce_flags
into
a
ce_na
m
e
len f
i
el
d
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2012-07-09
Thomas Gummerer
Replace st
r
len() with ce_
n
amelen(
)
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree