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 'ds/reachable-first-parent-fix'
2018-09-24
Thomas Gummerer
t5551: compa
r
e sorted cookies files
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-09-24
Thomas Gummerer
t
5
551:
m
ove setup code in
s
ide
t
est
_
e
x
pect blocks
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-09-14
Thomas Gummerer
linear
-
assignment: fix p
o
t
e
ntial out
o
f bounds memory
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-29
Thomas Gum
m
erer
.
g
i
tattribut
e
s: add conflict-mark
e
r-s
i
z
e
for
r
e
l
e
vant
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-29
Thomas Gummerer
rere
r
e: add note abou
t
f
iles with existing co
n
flict
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-29
Tho
m
a
s
Gummerer
rerere: mention caveat about unmatched
co
n
f
l
ict m
a
rke
r
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gumme
r
er
rerere: recalcul
a
te conflict ID whe
n
unre
s
olved
c
on
f
lict
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Tho
m
as G
u
mmerer
rerere: t
e
ach rerere to
han
d
le nested c
o
nflicts
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thom
a
s Gu
m
merer
rerere: return str
b
uf from
ha
n
dle path
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
m
as Gumm
e
rer
rerere: factor out handle_conflict funct
i
o
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rerere
:
only r
e
t
u
rn w
h
ether
a
path has conflicts or no
t
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
T
h
oma
s
Gummerer
rerere: fix cra
s
h
wit
h
fi
l
es rer
e
re can't handle
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
T
h
o
mas Gummerer
r
e
rere: add d
o
c
u
mentation
f
o
r
conflict normali
z
ation
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
G
umme
r
er
rerere: mark strings fo
r
translati
o
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gu
m
merer
r
erere:
w
r
ap paths in output in sq
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Thom
a
s Gu
m
merer
rerere: lowerc
a
se err
o
r messages
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Th
o
ma
s
G
u
mmere
r
rer
e
r
e: unify e
r
ror messages when read_cache fails
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Th
o
mas Gummer
e
r
not
e
git-security@goog
l
egrou
p
s
.
com in more places
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gummerer
Sub
m
ittingPatches: replace nu
m
bere
d
a
ttrib
u
tes with
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thom
a
s
G
ummerer
worktree: t
e
ach "add" to
che
c
k out
existi
n
g branches
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thomas Gu
m
merer
worktree
:
factor ou
t
dwim
_
br
a
n
c
h function
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thoma
s
Gummerer
w
o
rkt
r
ee: imp
r
ove m
e
ssage when cr
e
ating a new worktree
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thoma
s
Gum
m
erer
worktree: re
m
ove ex
t
ra
memb
e
rs from struct add_opts
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Thomas Gummerer
c
o
mpletio
n
: make stash -p
a
nd ali
a
s for stash push -p
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Thomas Gum
m
ere
r
completion: stop showin
g
'
save' for stash
by default
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-12
Thomas Gummerer
Submit
t
in
g
Patches: mention the git conta
c
ts command
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-28
T
h
o
mas
G
u
m
merer
git-stash
.
txt: remov
e
e
x
tra squar
e
bracket
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-21
Thomas Gu
m
mere
r
stash: drop superfluos pathspec parameter
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-20
Thom
a
s
G
u
m
merer
st
a
sh pus
h
-u:
d
o
n't create empty stash
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-20
T
h
omas G
u
mmerer
s
tash push: avoid prin
t
ing errors
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-02-02
Th
o
mas
Gummerer
reset
-
-hard: make use
of the pretty machinery
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gum
m
erer
travis: run tests
with GIT_TEST_
S
PLIT_INDEX
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gummerer
split-
i
nd
e
x: don't w
r
i
t
e c
a
che
tree wi
t
h nu
l
l oid entries
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Th
o
mas Gummerer
read-cach
e
: fix reading the
shared
ind
e
x
f
o
r ot
h
er
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-08
Th
o
mas Gummerer
oidset
:
don't retu
r
n
v
a
lue from oidset_init
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-08
Thomas
Gu
m
m
e
r
e
r
stash: don't delete u
n
tracked fi
l
es tha
t
ma
t
ch path
s
p
e
c
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-12-06
Tho
m
as Gummerer
ad
d
worktree
.
g
u
es
s
Remot
e
config opt
i
on
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-12-06
Thomas Gu
m
merer
worktree: add --
g
uess-remote
f
lag to add subcommand
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gumme
r
er
t/
R
EADME: docum
e
nt
t
e
st
_
cmp_rev
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
t/README: remove mention of adding copyright notices
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
worktree: make add <p
a
th> <bran
c
h>
d
w
i
m
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
T
homas Gummerer
w
or
k
tree: add
--[no-]track option to the add subcommand
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
T
homas Gummerer
worktree:
add can be crea
t
ed from a
n
y
c
ommit
-
ish
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
T
homas Gummerer
c
heckout: factor
o
u
t
functions to new lib file
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thomas
G
ummerer
s
ta
s
h: remove now
s
uperfluos help for "stash p
u
sh"
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thomas Gummerer
stash:
mark
"
g
it stash save"
d
eprecated in the man
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thomas Gumm
e
rer
stash: replac
e
"git stash save" with "git st
a
sh
p
us
h
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-04
T
h
o
mas Gummerer
http-push
:
fix
construction of h
e
x value from path
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-09-14
Thomas Gummerer
refs
:
s
tr
i
p out not allowed flags from
r
e
f_trans
a
ction_u
p
date
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-09-08
Thomas Gummerer
re
a
d-cache: fix index corruption
wit
h
index
v
4
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-05-17
Thomas Gummerer
completion: a
d
d git stash push
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
T
h
omas
G
u
m
merer
sta
s
h: keep un
t
r
acked files
intact
i
n stash -k
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thomas Gummerer
stash:
p
a
s
s the pa
t
hs
p
ec
a
rgume
n
t to git
r
e
set
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thomas
Gu
m
mere
r
stash: don'
t
show internal
imp
l
ement
a
tion details
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thomas Gummerer
stash: allo
w
pat
h
specs in the no verb form
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thomas
G
u
m
merer
sta
s
h
: use
s
tash_
p
ush for
no
v
erb fo
r
m
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thomas Gu
m
m
erer
st
a
sh: tea
c
h 'push' (and 'create_
s
tash') to
honor pathsp
e
c
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
T
h
o
ma
s
Gum
m
erer
s
ta
s
h: refac
t
or stash
_
create
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
T
homas Gumm
e
rer
stash: add
t
est
for the create command line arguments
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
Thomas Gummere
r
stash
:
in
t
rod
u
ce push verb
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-13
Thomas Gummer
e
r
Documentation/stash: remove mention of
git
r
eset
-
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-15
Thomas
Gummerer
ad
d
:
m
o
dify
a
l
r
e
a
dy added
f
i
les when --ch
m
od is given
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-15
T
h
oma
s
Gummerer
r
ead-c
a
che: introduce chmod_
i
n
d
ex_entry
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-14
Thom
a
s Gummerer
updat
e
-index: add
test
f
or
chmod
f
l
a
gs
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-12
Thom
a
s Gummer
e
r
add: d
o
cu
m
ent the chm
o
d
o
ption
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-08-29
Thomas
G
u
m
mer
e
r
blame:
fi
x
s
e
gfault on u
n
tracked file
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Th
o
mas Gumme
r
er
remote: u
s
e remote_is_c
o
nfigured(
)
for add and ren
a
me
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thoma
s
Gu
m
mere
r
remote: actually check if remo
t
e exits
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thomas Gumme
r
er
remote:
s
implify remote_is
_
c
onfigur
e
d(
)
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
T
h
o
m
as Gummer
e
r
remote: use p
a
r
s
e_c
o
nfi
g
_key
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thomas Gummerer
ls-r
e
mote: add support
f
or showing
symrefs
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thomas
G
um
m
erer
l
s-remote: use p
a
rse-option
s
a
p
i
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thom
a
s Gummerer
ls-remote: f
i
x sy
n
opsis
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thomas
Gummerer
ls-rem
o
t
e
: document
-
-re
f
s option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thoma
s
Gummerer
ls-r
e
mote: document
-
-quiet opti
o
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-12
Thomas Gummerer
built
i
n/gr
e
p: add grep
.
fallbackToNoIndex config
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-11
Thomas Gummere
r
t7810: corre
c
t --no
-
index test
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Thomas
G
ummerer
t
1
5
01
:
fix
t
e
st with split index
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-20
Thoma
s
G
u
mmer
e
r
read-cache: f
i
x
reading of sp
l
i
t index
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-20
Thomas
Gumme
r
e
r
t1700: make
te
s
t pas
s
with index-v4
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Thomas G
u
mmerer
r
e
ad-cache: a
d
d i
n
dex
.
versi
o
n conf
i
g
variabl
e
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Thomas
G
ummerer
test-lib: allow s
e
tting the index format version
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Th
o
mas G
u
mmere
r
i
n
trod
u
ce GIT_INDEX
_
VERSI
O
N e
n
v
i
ronment variable
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-16
Thomas Gummerer
diff:
a
void
s
ome nest
i
ng
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-16
Th
o
m
a
s
G
u
mmerer
d
i
ff: ad
d
t
est for --no-index executed outside
r
epo
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-12
Thomas Gummerer
diff
:
don't read index
w
hen --no-index i
s
g
iven
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-12
T
homas Gu
m
merer
diff: move
n
o-index
d
ete
c
tion
to builtin/
d
iff
.
c
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-08-20
Thomas Gumme
r
er
read
-
cac
h
e: use
f
ixed width integ
e
r
t
ypes
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-06-30
T
h
o
m
as Gummerer
perf
-
lib: fix st
a
rt/stop of per
f
tests
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-05-22
Tho
m
as Gummerer
prompt: fix
s
how upstream
with
s
vn and zsh
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2012-07-11
Tho
m
a
s
G
ummerer
S
trip namel
e
n out of ce
_
flags into a ce_namel
e
n fiel
d
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2012-07-09
Thom
a
s
G
umme
r
er
Repl
a
ce st
r
len() with ce_namelen()
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree