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: recalculate conflict ID when unresolved conflict is committed
2018-08-06
T
h
o
mas Gummerer
r
erere: recalculate
c
o
n
flict ID whe
n
unre
s
olved conflict
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
T
h
omas
G
u
m
m
erer
rerere: t
e
ach rer
e
r
e
to
h
andle nested c
o
nflicts
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
mas Gummerer
rere
r
e
:
return strb
u
f f
r
om handle pa
t
h
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
T
homas Gummerer
rerere: fact
o
r out handle_co
n
fl
i
ct fu
n
ction
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
mas Gummerer
re
r
e
r
e: only retur
n
whether a
path
h
as conflic
t
s o
r
not
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
Gumme
r
er
r
e
r
ere: fix
crash with fil
e
s r
e
rere
c
an't handle
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
T
homas Gumm
e
rer
rerere: ad
d
documentation f
o
r c
o
nflict normalization
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
G
ummer
e
r
rerere
:
mark s
t
r
ings fo
r
translat
i
on
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thomas G
u
mmerer
rerere: wrap
p
aths in output in sq
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thomas G
u
m
m
erer
r
e
r
e
r
e: lowercase erro
r
mes
s
ages
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-16
T
h
omas Gummere
r
r
erere: unify
er
r
or
me
s
sages when
read_cac
h
e
fails
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gummerer
no
t
e git-security@
g
oo
g
l
e
g
r
oups
.
com
in mo
r
e places
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-01
Th
o
mas Gu
m
merer
SubmittingPatch
e
s
:
replace nu
m
bered
attributes with
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-30
T
h
omas Gummerer
worktree: te
a
ch
"add" to check out exist
i
ng bran
c
hes
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-30
Thom
a
s Gummer
e
r
work
t
ree: factor out d
w
im_br
a
nch f
u
nction
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-30
Thomas
Gummerer
worktree: improve
m
essage w
h
en creating
a
new wor
k
tr
e
e
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-30
Thomas Gummerer
worktree: r
e
m
ove extra member
s
from struct add
_
opts
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Thomas
Gumme
r
er
comple
t
io
n
: make stash -p and alias for s
t
ash push -p
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Thom
a
s Gum
m
erer
completion: stop
showing 'save' fo
r
stas
h
by default
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-12
Thomas Gummerer
SubmittingPatches
:
m
e
nti
o
n the git contacts command
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gummer
e
r
gi
t
-stash
.
t
x
t: r
e
move ex
t
r
a
square bracket
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-03-21
Tho
m
as Gummere
r
stash: dro
p
superfluos pathspec
param
e
ter
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-03-20
Th
o
mas Gumme
r
er
stash push -u
:
don't c
r
eate
em
p
ty s
t
ash
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-03-20
Thoma
s
G
u
m
merer
stash
p
ush:
avoid printing
e
r
r
o
rs
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-02
Thomas Gummerer
reset --hard: ma
k
e use of the pretty machinery
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Th
o
mas Gum
m
e
rer
trav
i
s:
ru
n
t
ests
w
ith GIT_TES
T
_SPLIT_INDEX
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gummerer
s
p
l
i
t-in
d
ex: don't write cache tree with null oid entr
i
es
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gummerer
read-cac
h
e
:
f
ix
r
eading the shared index for other
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-08
Thomas Gummerer
oi
d
set: don't
r
e
t
u
rn va
l
ue from
oid
s
e
t_i
n
it
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-08
T
homas Gummerer
stash: d
o
n
'
t delete untracked files
t
hat match pathspe
c
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-06
T
homas Gummerer
add w
o
rkt
r
ee
.
guessRemote config optio
n
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-06
Thomas Gummer
e
r
work
t
ree: add --gu
e
ss-remote flag to a
d
d su
b
comm
a
nd
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Tho
m
as Gumm
e
rer
t/REA
D
ME: docum
e
nt test_cmp
_
r
ev
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Thom
a
s Gummerer
t/README: remove mention of adding c
o
pyright notices
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
T
h
omas Gummerer
w
or
k
tree: make
a
dd <path> <branch
>
dwim
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gu
m
merer
wo
r
k
tree: ad
d
-
-
[n
o
-]tra
c
k option to the add
s
ubcommand
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
w
o
rktree:
add can
be created from any
commit
-
ish
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
ch
e
ckout
:
factor
ou
t
functi
o
ns to new lib file
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-10-27
T
h
o
ma
s
Gummerer
stas
h
: re
m
o
ve now supe
r
fluos he
l
p
f
o
r "s
t
ash
p
u
sh"
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-10-27
Thom
a
s Gummerer
s
tash: mark
"gi
t
stash save" deprecated in the man
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-10-27
T
h
omas
G
ummer
e
r
st
a
sh: replace
"
git stash save" with "git stash push
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-10-04
Thomas Gummerer
ht
t
p
-
p
ush: fix constru
c
tion of hex value
from path
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-09-14
Thomas Gummerer
refs: strip
o
ut not all
o
wed fla
g
s
f
rom
r
ef_tran
s
action_
u
pdate
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-09-08
Tho
m
as Gummerer
r
ead-
c
ache: fix index corrupt
i
on wit
h
i
n
dex
v
4
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-05-17
Thomas Gummerer
completi
o
n:
add git stash push
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-22
T
h
omas
G
umm
e
rer
st
a
sh: keep
u
ntracked files
intact
i
n stash -
k
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-22
T
homas Gumm
e
rer
s
t
ash: pass the pa
t
hs
p
ec ar
g
u
ment to gi
t
rese
t
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-22
Tho
m
a
s Gummerer
sta
s
h: don't
show internal
imp
l
ementation
d
etai
l
s
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-28
T
hom
a
s Gummere
r
stash: allow pathspecs in the no ve
r
b
f
orm
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-28
T
homas Gummere
r
stash: use sta
s
h
_
push for no verb
f
orm
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-28
T
ho
m
as Gummerer
st
a
s
h
: teach '
p
ush' (and
'
create
_
stash') to honor p
a
thspec
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-20
Thomas Gummerer
stash
:
ref
a
cto
r
stas
h
_create
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-20
Thomas Gummerer
s
t
as
h
:
add
t
es
t
f
or the
c
reate c
o
m
mand line argum
e
nts
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-20
T
h
om
a
s Gummer
e
r
s
ta
s
h: introduce pus
h
verb
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-13
Thomas Gum
m
erer
Docum
e
ntation/stash: remove mention of gi
t
reset -
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-09-15
Thoma
s
Gummerer
a
d
d
:
modify already added
fil
e
s when --chmod
i
s
giv
e
n
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-09-15
T
h
omas
Gummerer
r
ead-c
a
che: in
t
ro
d
uce chmod_index_entr
y
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-09-14
Thoma
s
Gumme
r
er
update-
i
ndex: add test for c
h
mod
flags
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-09-12
Thomas
Gummerer
ad
d
:
document
the ch
m
o
d opti
o
n
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-08-29
Th
o
ma
s
G
ummerer
bla
m
e: fix segfault on u
n
t
rac
k
e
d
f
iles
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-02-16
Thomas Gummerer
re
m
o
te: use remote_
i
s_confi
g
u
red(
)
for
a
dd and r
e
na
m
e
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-02-16
Thomas Gummerer
rem
o
te
:
actually ch
e
ck if remo
t
e exits
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-02-16
Tho
m
as
G
u
mmerer
remote: simplify remote_
i
s_configu
r
ed()
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-02-16
Thom
a
s Gummerer
rem
o
t
e: us
e
par
s
e_config_key
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Thomas
Gummere
r
l
s-remote: add
s
up
p
ort
f
or
s
howing sy
m
ref
s
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Thomas Gumme
r
er
l
s
-remote: use parse-opt
i
ons api
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Th
o
mas Gum
m
erer
ls-remote: fix synop
s
is
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Thomas Gummerer
l
s
-
remote: document --refs
o
ption
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Thomas Gummerer
l
s
-remote: do
c
ument --quie
t
option
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-12
Thom
a
s Gummerer
b
u
ilt
i
n/grep: add grep
.
fall
b
ack
T
oNoIn
d
e
x config
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-11
Thomas Gumm
e
rer
t7810:
c
o
r
r
ec
t
--no-inde
x
te
s
t
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Thomas Gummer
e
r
t15
0
1: fix test with split index
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-20
Thomas Gumm
e
rer
read-
c
ache:
f
ix rea
d
ing of spli
t
index
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-20
Thomas Gummerer
t
1
7
00:
make test pass with index-v4
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gumme
r
er
r
e
ad
-
cache: add index
.
version c
o
nfig variab
l
e
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gummerer
test-l
i
b:
a
llow setting the index for
m
at ve
r
si
o
n
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gummerer
introduce G
I
T_IN
D
EX_VERSION enviro
n
ment variable
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-12-16
Thomas
Gu
m
merer
di
f
f: av
o
id some nesting
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-12-16
Thom
a
s G
u
m
m
erer
d
i
ff: ad
d
t
e
st for
-
-
no-
i
n
d
ex ex
e
cuted outside re
p
o
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-12-12
T
homas Gummerer
d
if
f
:
don'
t
read i
n
d
ex when --no-ind
e
x
i
s g
i
ven
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-12-12
Tho
m
as
G
ummerer
dif
f
:
move no-index
d
etection to builtin/dif
f
.
c
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-08-20
T
homas Gummerer
read-ca
c
h
e
: use fixe
d
width integ
e
r
types
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-06-30
T
ho
m
a
s Gummerer
perf-l
i
b: fix start
/
s
t
op of
perf tes
t
s
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-22
Thomas Gu
m
merer
p
rompt: fix show
u
pstream with svn a
n
d zsh
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-11
T
h
omas Gummerer
Strip namelen out of ce_flags
i
nto a ce_
n
amelen field
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-09
Th
o
mas
G
ummere
r
Rep
l
ace
strlen() with ce_namelen()
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree