repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/better-conflict-resolution'
2008-09-29
Shawn O
.
Pearce
Merge
branch 'jc/be
t
ter-con
f
lict-resolution'
commit
|
commitdiff
|
tree
2008-09-26
S
h
awn O
.
Pearce
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
w
n
O
.
Pearce
M
e
rge b
r
anch 'mv/mer
g
e
-
recu
r
sive'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
P
e
arce
Merge branch
'
jc/alternate-push'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge branch 'am/status'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
P
earce
M
e
rge
b
ranch 'pb/
a
u
t
o
correct-wrapper'
commit
|
commitdiff
|
tree
2008-09-25
Shaw
n
O
.
Pearc
e
Merge bra
n
ch 'mv/commit
-
tree'
commit
|
commitdiff
|
tree
2008-09-25
S
h
awn O
.
Pe
a
rce
M
erg
e
branch
'jc/apply-inclu
d
e
-exclude'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearc
e
Merge
bra
n
ch 'j
c
/safe-c-
l
-d'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pearce
Merge br
a
n
ch
'
ho/dirstat-by-fil
e
'
commit
|
commitdiff
|
tree
2008-09-25
S
hawn O
.
Pea
r
c
e
Merge gi
t
://repo
.
or
.
cz/
g
it-gu
i
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pea
r
ce
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn O
.
Pearce
Update
r
elease notes
for 1
.
6
.
0
.
3
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
git-
g
ui:
A
ssume
`blame --increme
n
tal` output is
i
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
S
h
awn O
.
P
earce
git-gu
i
: Use
gitattri
b
ute "encod
i
ng" for
f
il
e
content
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
g
it-gui: Hide commit
r
ela
t
ed U
I
duri
n
g
citool --
n
ocommit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
git-gui: Fix diff
p
ar
s
ing for li
n
es starting
with
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
S
h
awn O
.
Pearce
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-22
Sha
w
n O
.
Pearce
M
ake reflog query '@{12191882
9
1}' act as '@{
2
008
.
8
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-12
Shawn O
.
Pearce
pack-objects:
Allow missing
b
as
e
objects when creating
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-10
Shawn O
.
Pe
a
rce
git-gui 0
.
11
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
S
h
aw
n
O
.
Pearce
git-gui: Upd
a
te git-gui
.
pot for 0
.
11
n
earing release
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Shawn
O
.
Pearce
git-
g
ui:
Fix gitk search in $PA
T
H t
o
w
o
r
k on W
i
ndows
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-27
S
h
awn O
.
Pearce
fsck: Don't
require
tm
p
_
o
bj_
file names
a
re
1
4 bytes
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-25
Shawn O
.
P
earce
git
-
gui
:
C
o
r
r
e
ct 'Visua
l
ize Branches' on
M
ac
O
S X
to
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
in
d
ex-pac
k
:
Honor core
.
delt
a
BaseCache
L
imit when resolvin
g
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pe
a
rce
index-pack: Track the
o
b
j
ec
t
_
entry that crea
t
es each
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n
O
.
Pearce
index-pack: Chain the struct base_data on the stack
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
inde
x
-
p
a
c
k: Re
f
actor bas
e
arguments
o
f
resolve_delt
a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
bash completion: Remove dashed command completion support
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-15
Sh
a
w
n O
.
P
e
arc
e
bash comp
l
e
t
ion: Resolve
git sho
w
r
e
f:path<tab>
l
os
i
ng
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-14
Shawn O
.
Pearce
bash
co
m
pl
e
tion: Append space
a
ft
e
r file
n
ames hav
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-13
Shawn O
.
Pearce
b
ash completion: Don'
t
o
ffer "a
.
.
" as a comp
l
etion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-13
Shawn
O
.
Pearce
bas
h
compl
e
ti
o
n
:
Improve responsiveness
o
f git-log
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-09
Sha
w
n O
.
Pearce
Cor
r
ect pack memory leak c
a
us
i
ng git gc to try
t
o
exceed
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-08
Shawn O
.
Pea
r
ce
R
e
move unne
c
essary p
a
ck-*
.
keep file aft
e
r succes
s
ful
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-03
Shawn O
.
Pear
c
e
Fix
d
escribe
-
-tags --
l
ong so it d
o
e
s not s
e
gf
a
u
lt
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-06-21
Shaw
n
O
.
P
e
arce
Corr
e
ct documentation for
g
i
t-pus
h
--mirror
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-06-13
Shawn O
.
P
e
arce
fast-export: Correc
t
ly generate initial
c
ommits with
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-06-01
Sh
a
wn O
.
P
earce
Make "git-
r
emote r
m
" delete refs acc
c
ordi
n
g
t
o
fetch
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-06-01
Shawn O
.
Pearce
Make "g
i
t-re
m
ote prun
e
" delet
e
r
e
fs according
to fetch
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-06-01
Shawn O
.
Pearce
Remov
e
unused remote_prefix member in builtin-remote
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-05-26
Shawn O
.
Pearce
Ignore no-op
changes i
n
pa
r
anoid
update hook
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-05-26
Sha
w
n
O
.
Pearce
Don't load missing ACL files in par
a
noid update hook
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-05-26
S
h
awn O
.
P
e
arce
Don't diff empty t
r
e
e
on bran
c
h creation in paranoi
d
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-05-23
S
h
awn O
.
P
e
a
r
ce
Clarify rep
a
c
k -n documentation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-05-22
S
h
a
wn O
.
P
ea
r
c
e
gi
t
-
gui
:
Handle w
o
rkdir
d
ete
c
tion when
C
Y
G
W
I
N=nowinsy
m
links
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-05-20
S
h
awn O
.
Pearc
e
git-gui:
Add a
--
t
race command lin
e
option
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-05-09
S
ha
w
n O
.
Pe
a
r
ce
git-gui: D
e
lete
b
ranc
h
es with 'g
i
t
branch -D' to clear
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-05-09
S
h
awn O
.
P
earce
git-gui: Setup branch
.
remote,merge
f
o
r shorthand git
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-04-24
S
hawn O
.
Pearce
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2008-04-24
S
h
aw
n
O
.
Pearce
g
i
t-gui:
Don't use
'
$$cr m
a
s
t
er' with aspell earlier
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-04-04
Shawn O
.
Pea
r
ce
git-gui: Swit
c
h keybi
n
dings for
[ and ] t
o
b
racketleft
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-04-02
Sha
w
n O
.
P
e
arce
git-g
u
i 0
.
10
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-15
Shawn O
.
Pear
c
e
g
i
t
-gui: Adj
u
sted Japanese trans
l
ation to updated
POT
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-15
Shawn
O
.
P
earce
gi
t
-gui: Don
'
t translate the special
Apple menu
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-10
Shawn O
.
Pearc
e
ba
s
h: R
e
move comp
l
etio
n
of cor
e
.
legacyheaders
o
p
t
ion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
P
e
arce
Teach git
-
fetch to explo
i
t ser
v
e
r
side automatic
tag
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
Teach fetch-pack
/
upload-pac
k
abou
t
--
i
nclude-
t
ag
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-05
Sh
a
wn O
.
Pea
r
ce
git-pack-obj
e
cts: Aut
o
mat
i
cally pack annotated tags
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-05
Sh
a
wn O
.
Pearc
e
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-03-05
Shawn
O
.
Pearce
git-
g
u
i
: Gracefully fall ba
c
k to po2ms
g
.
sh if msgfmt
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-04
Shawn
O
.
Pear
c
e
Fix
'
git r
e
mote show' regressio
n
on empty rep
o
sit
o
ry
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-04
S
h
awn
O
.
Pearce
Add git-descr
i
b
e test fo
r
"verify annota
t
e
d
tag
n
ames
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-04
Sha
w
n O
.
Pear
c
e
Tes
t
for p
a
cked tags
in g
i
t
-d
e
s
cribe o
u
t
put
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Don't allow git-descri
b
e fa
i
lures
to go
u
nnoti
c
ed
i
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
P
earce
Teach git-fe
t
c
h to grab a tag
a
t t
h
e sa
m
e time as a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-03
S
h
awn O
.
Pearce
Make git-f
e
t
ch
f
ollo
w
tags we already have
o
bjec
t
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-03
S
haw
n
O
.
Pearce
Te
a
ch upload-pack to l
o
g the re
c
eive
d
need lines
t
o
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-03
Sha
w
n O
.
Pea
r
ce
Free th
e
p
ath_lists us
e
d to f
i
n
d
n
on-l
o
cal tags in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-03
Shaw
n
O
.
Pearce
All
o
w
builtin-f
e
tch's find_non_local_
t
ags to
a
ppend
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-03
S
h
awn O
.
Pearce
Ensu
r
e
t
ail
p
ointer
g
ets setup correc
t
ly when we
fetch
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-03
S
h
awn O
.
Pearce
Remove unnecessary
d
elaying of fr
e
e
_refs(ref
_
map) in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pe
a
rce
R
e
m
o
ve unused v
a
riable i
n
bu
i
ltin-fetch find_non_local_tags
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-28
Shawn O
.
Pearce
Teach git-describe to
v
erify annotate
d
tag names before
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-28
Sh
a
w
n O
.
P
earce
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-02-28
S
hawn O
.
Pearc
e
git-gu
i
: Paper bag
f
i
x
info dialog when
no
f
i
les are
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-25
Shawn O
.
Pe
a
rce
C
o
rre
c
t
fa
s
t-export file m
o
d
e
stri
n
gs
t
o
m
atch fast
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-24
Shawn O
.
Pearce
Us
e
g
i
t
-describe --exact-match i
n
bash
prom
p
t on
d
e
t
ache
d
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-24
Shawn O
.
Pearce
T
each git-describe
--e
x
act-m
a
tch
to a
v
oi
d
ex
p
ensive
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-24
Sha
w
n
O
.
P
e
a
r
ce
Avoid a
c
cessing n
o
n-tag refs in git-describ
e
unless
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-24
Shawn O
.
Pear
c
e
Teach
git-d
e
scribe to use p
e
e
l
ed ref information w
h
en
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-24
S
h
awn O
.
Pear
c
e
Optimize pe
e
l_ref
f
or th
e
current r
e
f of a for_
e
ach_
r
ef
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-24
S
h
awn O
.
Pearce
P
r
ote
c
t peel_ref f
a
llback case from
N
UL
L
parse_object
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-24
Shawn O
.
Pearce
Ensure
'
make dis
t
' c
o
mpiles git-a
r
c
hive
.
exe
on Cy
g
win
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-22
Shawn O
.
Pear
c
e
Me
r
ge
branc
h
'maint'
commit
|
commitdiff
|
tree
2008-02-22
S
h
awn O
.
P
e
arce
git-gui: Focus insertion point at end of strings in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-22
Shawn O
.
Pearce
git-gui: Avo
i
d hardcoded Windows pat
h
s in
Cy
g
win package
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-22
Shawn O
.
Pear
c
e
git-gui: Default TC
L
_PATH to same loca
t
ion as TCLT
K
_P
A
T
H
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-22
Shawn O
.
Pearce
git-gui
:
Pa
p
er
bag fix e
r
ror dialogs opening over the
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-21
Shawn O
.
Pearce
git-
g
ui: Shorten Aspel
l
v
e
rsion strings to just Aspell
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-21
Shawn O
.
P
e
arce
git-gui: Grace
f
u
lly di
s
p
lay non-aspell
versio
n
errors
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-21
Shawn O
.
Pearce
git-gui:
Catch and display aspell start
u
p failur
e
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-21
Sh
a
wn O
.
Pearce
git-
g
ui: Only bind the spellcheck pop
u
p
s
uggestion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-21
Sha
w
n O
.
Pea
r
ce
gi
t
-gui: Rem
o
ve explicit references to 'aspell'
i
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-21
S
h
awn
O
.
Pearce
gi
t
-gui: Ensure all spellchecker '
c
l
ass' var
i
ables
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-21
Shawn O
.
Pearc
e
Merge br
a
nch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-02-21
S
hawn
O
.
Pearce
git-gui: Ensure err
o
r dialogs alway
s
appear
over all
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-02-21
Shawn
O
.
Pear
c
e
T
e
ach git-grep
-
-
name-only
a
s synony
m
for -l
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next