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: teach rerere to handle nested conflicts
2018-08-06
Thomas Gumm
e
r
e
r
rerere: teach rerer
e
t
o handle nested conflicts
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
T
h
omas Gummerer
rerere: return strbuf fro
m
handle pat
h
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gu
m
m
er
e
r
rerere:
f
actor out h
a
n
d
le_conflic
t
funct
i
on
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rerere: only return whether a pa
t
h has conflic
t
s
or not
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rerere:
f
ix crash with
f
iles rerere can
'
t handle
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
mas
G
ummere
r
rerer
e
: add doc
u
mentation for conflict nor
m
ali
z
ation
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummer
e
r
rerere: mark strings for translation
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-16
T
homas Gumm
e
rer
re
r
ere: wrap paths in output in sq
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thomas
G
u
mmer
e
r
r
e
r
ere: lowerca
s
e err
o
r mess
a
ges
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-16
T
h
omas Gu
m
merer
r
ere
r
e: unify
e
rror mes
s
ages when read_cache f
a
ils
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gum
m
ere
r
n
ote git-secur
i
ty@go
o
glegroups
.
co
m
in more places
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-01
Tho
m
as Gu
m
merer
Su
b
m
itt
i
n
g
P
a
tc
h
es: rep
l
a
ce numbered attributes wit
h
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-30
Thomas
G
u
m
me
r
er
worktree: t
e
ach "a
d
d" to check o
u
t existing branches
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-30
Thomas Gummere
r
w
o
rk
t
ree: fac
t
or out dwim
_
bra
n
c
h
function
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-30
Thomas
G
ummerer
worktree: improve
message whe
n
cre
a
ting a new worktree
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-30
Thoma
s
Gummerer
worktree: re
m
ove extra members fr
o
m s
t
r
u
c
t ad
d
_opts
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Thomas Gummerer
completion: m
a
ke stash -p
a
n
d
alia
s
for stash
push
-
p
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
T
homas Gummer
e
r
completio
n
: stop sh
o
wi
n
g
'
s
ave' for st
a
sh b
y
default
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-12
Tho
m
as Gumme
r
er
Su
b
mittingPatch
e
s: mention the git contacts command
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gummerer
git
-
stash
.
t
xt: re
m
ove
e
xtra squa
r
e bracket
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-03-21
Thomas Gummerer
sta
s
h
:
d
r
o
p
s
u
p
erfluos pathspec parame
t
e
r
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-03-20
Th
o
ma
s
Gum
m
er
e
r
stash push -u: don't
c
reate empty stash
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-03-20
Thomas Gummerer
s
t
ash push: avo
i
d printing
e
rrors
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-02
T
h
o
mas Gu
m
merer
r
eset
-
-
hard: make use o
f
the pretty machi
n
ery
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Thom
a
s Gum
m
erer
travis: run tests with
G
I
T
_TEST_SPL
I
T
_
INDEX
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gumm
e
rer
split-index:
d
on't write cache tree with
null oid entries
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gummerer
r
ead-cac
h
e: fix
r
eading the shared i
n
dex
for ot
h
er
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-08
Thomas
Gummere
r
oidset: don't r
e
turn value from oidset_in
i
t
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-08
Thomas Gummerer
st
a
sh: don't delete u
n
t
rac
k
ed f
i
les
tha
t
ma
t
ch
p
athspec
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-06
Thomas Gum
m
erer
add wor
k
tree
.
guessRemote config optio
n
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-06
Thomas Gummerer
w
o
rktree: add
--guess-remote flag to
add sub
c
om
m
and
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Thomas
Gummerer
t/README: doc
u
ment tes
t
_cmp_re
v
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gumm
e
rer
t/RE
A
DME: remov
e
men
t
io
n
of adding copyright notices
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
T
homas Gu
m
me
r
er
worktree: make add <path
>
<branch> dwi
m
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Thom
a
s Gummerer
wo
r
ktr
e
e: add --
[
no
-
]
t
rack option to the
add sub
c
omman
d
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
T
homa
s
Gumm
e
rer
worktr
e
e: ad
d
can
be c
r
eated f
r
o
m
any commit-ish
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
T
homas Gu
m
merer
checkout: facto
r
out fun
c
tions to new
l
i
b
file
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-10-27
Thomas Gumme
r
er
stash: remove
n
ow superfluos help
for
"
st
a
sh push"
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-10-27
T
h
omas
Gummerer
sta
s
h: mark "gi
t
stash save" d
e
pr
e
cated in t
h
e man
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-10-27
Tho
m
as
G
ummer
e
r
stash: r
e
place
"
git st
a
sh s
a
v
e
" with "gi
t
stash push
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-10-04
Thomas Gumm
e
rer
htt
p
-p
u
sh:
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
Gummere
r
refs: stri
p
o
u
t not allo
w
ed
flags from ref_transaction_update
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-09-08
Thomas Gum
m
e
r
er
read-cache: fix index cor
r
u
p
ti
o
n with index v4
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-05-17
Thoma
s
Gummerer
completion: ad
d
git stash push
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-22
T
h
omas
Gummerer
stash:
keep unt
r
acked files in
t
act
i
n stash -k
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-22
T
h
omas Gu
m
merer
stash: pass the pathspec argument
to git
reset
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-22
Thomas Gumm
e
r
e
r
st
a
sh:
don
'
t
s
how internal im
p
l
e
m
entation details
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-28
Thomas Gummerer
stash
:
allow pathspecs in the
no verb for
m
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-28
Thomas Gummerer
stash: use stash_push
f
o
r no
verb form
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-28
Thom
a
s
Gum
m
erer
stash
:
t
each 'push' (
a
nd 'create
_
stash') to honor
p
a
t
h
spec
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-20
T
homas Gu
m
merer
stash: refactor stash_
c
rea
t
e
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-20
Thomas
Gummerer
sta
s
h: add test for th
e
create co
m
ma
n
d line arguments
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-20
T
homas Gummerer
sta
s
h: introduce
p
u
s
h
verb
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-13
Thomas Gummerer
Documenta
t
ion/st
a
sh: remove ment
i
on of git reset -
.
.
.
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-09-15
Thomas
G
u
mmerer
ad
d
: modify
a
lready added files when --chmod is given
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-09-15
Th
o
mas Gu
m
merer
read-c
a
che: i
n
troduce
chmod_index_entry
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-09-14
Th
o
mas Gummerer
upda
t
e-index: add t
e
st f
o
r chmod
flags
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-09-12
Thomas Gummer
e
r
add: docum
e
n
t the chmod opti
o
n
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-08-29
Thomas Gum
m
erer
blame: fix se
g
fa
u
l
t on untracked
files
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-02-16
Thomas Gummerer
remote:
use remote_is_co
n
figured
(
) for add
a
nd rename
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-02-16
T
homas Gum
m
er
e
r
re
m
ote:
actua
l
ly check if remot
e
exi
t
s
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-02-16
Thomas Gumme
r
er
remote: simplify
r
em
o
te_is_configured()
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-02-16
Tho
m
as Gu
m
mer
e
r
r
e
mote: use pars
e
_config_key
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Thomas
Gummerer
ls-remot
e
: add support for sh
o
w
i
ng symref
s
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Tho
m
as Gummerer
ls-remo
t
e: use parse-options api
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
T
h
omas Gu
m
mer
e
r
l
s
-
re
m
ote:
f
ix synopsis
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Thomas Gumme
r
er
ls-remote: docum
e
n
t --refs opti
o
n
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-19
Thomas
Gummerer
ls-remote:
d
ocument --quiet o
p
tion
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-12
Tho
m
as Gummerer
b
u
i
l
tin/
g
rep: add grep
.
fallbackToNoInde
x
conf
i
g
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2016-01-11
Thomas Gummerer
t7810:
co
r
rect --no-index tes
t
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Th
o
m
as Gummerer
t1501: fix test with split
inde
x
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-20
Thomas Gu
m
me
r
er
r
e
a
d-ca
c
he: fix
reading of sp
l
i
t i
n
dex
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-20
T
ho
m
as Gum
m
ere
r
t1700: make test pas
s
w
ith inde
x
-v4
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gum
m
erer
read-cache: add index
.
version config
v
ariable
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gummerer
t
est
-
lib:
a
llow setting th
e
index form
a
t
versio
n
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Th
o
mas Gummerer
introduce GIT_INDEX_
V
ERSION environm
e
nt variab
l
e
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-12-16
Thom
a
s Gummerer
diff: avoid some
n
esting
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-12-16
Thomas Gumme
r
e
r
d
i
f
f
:
add
test
f
or --no-index execute
d
out
s
ide repo
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-12-12
Thomas Gummerer
diff:
d
on't read index when --no-i
n
dex
is given
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-12-12
Thom
a
s Gummerer
diff: m
o
ve no-index de
t
ection to
b
uiltin/diff
.
c
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-08-20
Thomas
Gum
m
e
rer
read-cach
e
:
use
f
i
x
e
d
width integer ty
p
e
s
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-06-30
Thomas Gummerer
p
er
f
-lib
:
fix start/stop of perf tes
t
s
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-22
T
h
omas Gummerer
p
romp
t
: fi
x
show upstream with svn and zsh
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-11
T
homas Gumm
e
r
e
r
S
t
ri
p
nam
e
len
o
ut of ce
_
flags into a ce_namelen f
i
el
d
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-09
Thomas
G
ummerer
Replace s
t
rl
e
n() with ce_namele
n
()
Signed-off-by: Thomas Gummerer <
t.gummerer@gmail.com
>
commit
|
commitdiff
|
tree