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
Thomas Gum
m
er
e
r
r
ere
r
e
:
recalcul
a
te
c
o
n
f
lict
I
D
w
hen unresolved
c
onf
l
i
c
t
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummer
e
r
rerere: teach rere
r
e to
h
andle
n
ested conf
l
icts
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
G
u
m
mer
e
r
rerere: return strbuf
f
rom handl
e
path
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rerere: factor out handle
_
conflict fun
c
tion
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
mas
G
u
mmer
e
r
rerere: only return w
h
ethe
r
a path
has conflicts or not
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thoma
s
Gummere
r
r
e
rere: fix crash
w
i
t
h
files rerere can't han
d
le
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas G
u
mme
r
er
rerere: a
d
d documentation for conflict normalization
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
Gumme
r
er
rerere: mark
strings for
tran
s
la
t
ion
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Tho
m
a
s Gummer
e
r
rerere: wrap paths in
o
u
tput i
n
sq
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gummerer
rerere: lowercase
e
r
r
or messages
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-07-16
T
h
omas Gummer
e
r
rerere: unify error
messages when read_cache fails
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas
Gu
m
merer
note git-security@g
o
oglegro
u
p
s
.
c
o
m in m
o
re pla
c
es
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gummerer
SubmittingPatches:
replace
nu
m
bered attribut
e
s with
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
T
homas Gu
m
merer
worktr
e
e: teach
"a
d
d" to check out exist
i
ng bra
n
ches
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
T
h
o
mas Gummer
e
r
workt
r
ee: facto
r
out dwim_branch functio
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thomas Gummerer
worktree: i
m
prov
e
message when creati
n
g
a new worktree
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-30
Thomas Gummerer
workt
r
ee: remove e
x
tra member
s
from
s
truc
t
add_opts
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
T
h
om
a
s Gu
m
merer
completion: make stash -p
and al
i
as for stash push -p
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Thomas Gummerer
completion
:
stop sh
o
wing 'save' for stash by default
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-04-12
Thomas Gummerer
SubmittingP
a
t
c
h
es: mention t
h
e git
conta
c
ts command
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-28
T
h
omas Gummerer
git-stash
.
txt: remo
v
e extr
a
square bracket
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-21
Thom
a
s Gummerer
stash:
d
rop
s
u
perfluos
p
athspec para
m
e
te
r
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-20
Thomas Gum
m
erer
st
a
sh push -u
:
do
n
'
t
create empty stash
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-03-20
Thomas Gum
m
erer
stash
push: avoid print
i
ng e
r
rors
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-02-02
Thomas Gummerer
re
s
et -
-
h
a
rd: make
u
se of the pretty mach
i
nery
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gummere
r
travis:
r
un tests wit
h
GIT_TEST_SPLIT_IN
D
EX
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Th
o
mas Gummerer
spl
i
t-inde
x
: don't write
c
ache tr
e
e with null oid ent
r
ies
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Thomas Gummerer
read-cac
h
e: fix
r
eading the
shar
e
d index
for other
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-08
T
homa
s
G
u
m
merer
oi
d
set: don't return value from oidse
t
_init
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2018-01-08
Thomas Gu
m
merer
stash: don't delete untracked files t
h
at match pathspec
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-12-06
Thomas G
u
mmerer
add worktree
.
guessRemote config opt
i
on
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-12-06
Thomas
G
u
mmerer
worktree: add --guess-remote
flag
t
o add subcommand
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
T
homas Gummerer
t/README: document tes
t
_cmp_r
e
v
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
t/RE
A
DM
E
: remo
v
e mention of
a
ddin
g
co
p
yright notic
e
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thoma
s
Gummer
e
r
work
t
ree: make
a
dd <path> <br
a
nch>
d
wim
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas Gummerer
worktree: add --[no-]track
o
p
tion to the add subcommand
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thomas G
u
mme
r
er
wo
r
ktree:
a
dd can be created from any commit-ish
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Thoma
s
G
u
mmerer
c
h
eckout: factor out functions to ne
w
lib file
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thomas
Gum
m
er
e
r
stash: remove now superfluos
help for "stash push"
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thomas Gummerer
st
a
sh
:
mark "git
s
tash
save" depre
c
a
t
ed in the man
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-27
Thomas Gummerer
s
t
ash: replace "git stash
save" with
"
git stash push
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-10-04
Th
o
mas
Gummerer
h
ttp-push: fix con
s
tr
u
c
tion of hex v
a
lue from path
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-09-14
Th
o
mas
G
ummerer
r
e
fs
:
s
trip out not
a
ll
o
wed
f
lags from ref_trans
a
ction_update
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-09-08
Thomas G
u
mmer
e
r
read-c
a
che: f
i
x
i
ndex corr
u
pt
i
on with index v4
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-05-17
Thomas
G
ummerer
completion: add
git stash pus
h
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thomas Gummerer
stash: keep untracked files intact in stash
-k
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
Thom
a
s Gummerer
stash: pass the pa
t
hspec argume
n
t
to git reset
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-03-22
T
h
om
a
s Gummerer
stash
:
d
on't
show i
n
t
e
r
n
a
l
implementation
d
eta
i
l
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
T
homas Gumm
e
r
e
r
stash: a
l
low p
a
thspecs
i
n
t
h
e no verb form
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thoma
s
G
u
mmerer
stash: use stash_
p
u
s
h for no verb form
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-28
Thomas Gu
m
merer
stash: teac
h
'push' (an
d
'create_stas
h
') t
o
honor pathspe
c
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
Thomas Gum
m
erer
stash: r
e
fac
t
or stash_creat
e
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
Thomas Gummerer
stas
h
:
add
t
est for the
c
reate command
l
ine a
r
guments
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-20
T
homas Gumm
e
rer
stash
:
i
n
troduce pus
h
v
e
rb
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2017-02-13
Tho
m
as G
u
m
merer
Docu
m
ent
a
tio
n
/stash:
remove mention of git
reset -
.
.
.
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-15
Thomas Gum
m
erer
add: mod
i
f
y
alread
y
added
f
iles whe
n
--chm
o
d is given
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-15
Thomas Gummerer
r
ead-cache: in
t
rodu
c
e chmod_ind
e
x_entry
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-14
Thomas Gummerer
up
d
ate-index: add test
f
or chmod
f
l
ags
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-09-12
T
h
o
mas
Gumme
r
er
a
dd: document the c
h
mod optio
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-08-29
T
h
omas Gummerer
blame
:
f
i
x
s
egfault on untracked
f
iles
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thomas
Gum
m
erer
remote: use remote_is
_
conf
i
g
u
r
e
d() for add and re
n
a
me
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
T
h
omas Gumme
r
er
remo
t
e
: actually
c
heck if re
m
ote exits
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thomas Gummerer
r
emote
:
s
i
m
plify
r
e
m
o
te_is_configure
d
()
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-02-16
Thomas Gummere
r
remote: use pa
r
se_config_key
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
T
h
o
mas Gumme
r
er
ls-
r
emote: add suppo
r
t for showing
s
ymrefs
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thomas Gummerer
ls-remote: use pars
e
-opt
i
ons api
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Thomas
G
ummere
r
ls-
r
em
o
te: fix sy
n
o
p
s
i
s
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
Th
o
mas Gummerer
ls-remote: do
c
ument
--
r
efs option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-19
T
h
o
mas Gummerer
l
s-remote
:
document --quiet
option
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-12
T
h
omas Gummerer
builtin/g
r
ep: add grep
.
fallback
T
oNoIn
d
ex config
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2016-01-11
Thomas Gummerer
t7810: correc
t
--
n
o-index test
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Thomas
Gum
m
erer
t
1
501:
f
ix test wi
t
h sp
l
it index
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-20
Thomas
G
u
m
m
erer
read-cache: fix reading of split index
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2015-03-20
Thomas
Gummerer
t1700: make
t
es
t
pass with
index-v4
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Thomas Gumme
r
er
read
-
ca
c
he:
a
d
d i
n
d
e
x
.
vers
i
on config
variable
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Tho
m
as Gumm
e
r
e
r
te
s
t-lib: allow setting
t
he index
form
a
t ver
s
ion
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Thom
a
s Gummere
r
introduce GIT_IND
E
X
_VE
R
SION environment v
a
ri
a
ble
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-16
Thomas Gumme
r
er
diff:
a
void some nes
t
ing
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-16
T
h
omas Gummerer
d
i
ff
:
add
t
est for --no-index
e
xecuted o
u
tside repo
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-12
Thomas G
u
mmerer
diff: don't re
a
d
index when
-
-no-index
i
s
give
n
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-12-12
T
h
o
m
as Gummerer
diff: move no
-
index detec
t
ion t
o
builtin
/
diff
.
c
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-08-20
Thomas Gumme
r
e
r
re
a
d-cache: use fi
x
ed width inte
g
er types
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-06-30
Thomas
G
ummerer
perf-lib:
f
ix sta
r
t/st
o
p of perf tests
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2013-05-22
Thomas Gummerer
prom
p
t: fix show u
p
stre
a
m
w
ith svn and
zsh
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2012-07-11
Th
o
mas Gummerer
Strip name
l
en o
u
t
of ce_
f
la
g
s into
a
ce_namelen field
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree
2012-07-09
T
homas Gum
m
erer
Replac
e
str
l
en() wit
h
c
e
_n
a
m
elen
(
)
Signed-off-by:
Thomas Gummerer
<t.gummerer@gmail.com>
commit
|
commitdiff
|
tree