repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: describe 'union' low-level merge driver
2007-12-20
Sh
a
wn O
.
Pearce
Reallow g
i
t-rebase --interactive
-
-con
t
inu
e
i
f
commit
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-12-20
Shaw
n
O
.
Pearce
Catch and
handle gi
t
-
c
o
m
mit f
a
ilures
in git
-
re
b
a
s
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-12-20
Shawn O
.
Pearce
Avoid update
h
o
ok during git-re
b
ase --i
n
teractive
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-28
Shawn
O
.
P
e
arce
Remove git-s
t
atus fro
m
lis
t
of s
c
ripts as it
i
s
b
uiltin
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-21
Shawn
O
.
P
e
a
r
ce
git-g
u
i 0
.
9
.
0
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-18
Shawn O
.
Pearce
F
i
x warning
about bitfield in struct ref
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-14
Shawn O
.
Pe
a
rc
e
Handle broken vsnprintf implementatio
n
s in strbuf
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-14
Shawn O
.
Pear
c
e
Don't a
l
low fast-
i
mport tr
e
e del
t
a ch
a
i
n
s
to exceed
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-12
Shawn
O
.
Pearce
gi
t
-
fetch: avo
i
d local fe
t
ching from alter
n
a
t
e (agai
n
)
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-12
Shawn O
.
Pe
a
rce
rev-list: In
t
roduc
e
--quiet to a
v
oid /dev/nu
l
l r
e
directs
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-12
Shawn O
.
Pearce
run-command: Support s
e
ndin
g
stderr to
/de
v
/n
u
ll
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-12
Shaw
n
O
.
Pearce
g
i
t-f
e
tch: Always fetch tags i
f
t
he object
t
h
ey ref
e
r
ence
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-10
Shawn O
.
Pe
a
r
c
e
Fix
mem
o
ry leak in
traverse_commit_
l
is
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-08
Shaw
n
O
.
Pearce
g
it-gui: Bind Met
a
-T for "S
t
age
To Commit"
m
e
n
u
action
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-07
Sha
w
n O
.
Pe
a
rce
Reteach builtin-ls-r
e
mote t
o
understan
d
remotes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-01
Shaw
n
O
.
Pea
r
c
e
git-gui: Allow users to
s
e
t font weigh
t
s t
o
bol
d
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-26
Shawn O
.
P
e
ar
c
e
g
it
-
gui: Protect against bad translation strings
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-23
Shawn O
.
Pearce
Merge bra
n
ch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-10-23
Sha
w
n
O
.
Pe
a
rce
g
i
t-gui: Make sure we get errors from
g
it-up
d
at
e
-i
n
dex
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
Use PRIuMAX
i
nstead of 'un
s
igned long lo
n
g' in show
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
P
earce
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
Des
c
ribe mor
e
1
.
5
.
3
.
5 fi
x
es
in relea
s
e not
e
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-21
Sh
a
w
n
O
.
Pearce
I
m
proved const c
o
r
r
ectness for strin
g
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
Merg
e
git://git
.
kernel
.
org/pub
/
scm/
g
itk/
g
itk
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pe
a
rce
Merg
e
b
r
anch 'm
a
i
n
t
' o
f
git://repo
.
o
r
.
cz/
g
it-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
P
e
arce
Defin
e
compat v
e
rsio
n
of mk
d
temp for systems lac
k
in
g
it
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-21
Shaw
n
O
.
Pearce
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
g
it-gui: Don't
d
isplay
C
R withi
n
conso
l
e w
i
ndo
w
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-21
S
hawn O
.
Pearce
git-gui: H
a
ndle progress
b
a
rs from newer gits
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-20
Shawn O
.
Pearce
git-gui: Correctly report
f
ailures fro
m
git-
w
ri
t
e-tree
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
Pearc
e
Avoid scary e
r
rors about tagged trees/blobs
d
uring
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-19
Sha
w
n O
.
P
e
a
r
c
e
Merge
br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2007-10-19
Shawn
O
.
Pearce
Paper bag fix diff invocat
i
on
i
n
'
git
stash
show
'
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
Pe
a
rce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
Pearce
Further 1
.
5
.
3
.
5 fixes described in
relea
s
e notes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
Pe
a
r
ce
Stop d
i
spl
a
ying "
P
a
ck pack-$ID c
r
eate
d
.
" durin
g
gi
t
-gc
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-19
S
hawn O
.
Pe
a
rce
Teac
h
prune-pac
k
ed to use
the
s
tandard progress
m
eter
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-19
Sh
a
wn O
.
Pea
r
ce
Change 'Delti
f
ying obje
c
ts'
to 'Compre
s
s
ing
o
bj
e
cts'
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
Pearc
e
Avoid
i
nvok
i
ng
d
i
f
f drivers d
u
ring git
-
s
tash
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-18
Shawn O
.
P
e
a
r
ce
Me
r
ge br
a
n
c
h
'
jc/am-quiet'
commit
|
commitdiff
|
tree
2007-10-18
Shawn O
.
Pearc
e
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-10-18
Shawn O
.
P
e
ar
c
e
Yet more 1
.
5
.
3
.
5
fix
e
s
m
ention
e
d
i
n
r
elease notes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-18
Shawn O
.
Pe
a
r
c
e
Merge br
a
nch 'lt
/
diff-ren
a
me'
commit
|
commitdiff
|
tree
2007-10-17
Shawn O
.
Pearce
gi
t
-gui:
P
aper bag fix the
g
lobal confi
g
parsing
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-17
Shawn O
.
P
ea
r
ce
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-10-17
Shaw
n
O
.
P
ear
c
e
D
oc
u
m
ent add
i
ti
o
na
l
1
.
5
.
3
.
5
f
i
xe
s
in release notes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-17
S
hawn O
.
Pear
c
e
Avoid
'expr ind
e
x' on Mac OS X as it
isn't supported
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-17
S
h
awn O
.
P
e
arc
e
Correct typos in rel
e
as
e
notes for 1
.
5
.
3
.
5
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-16
Sha
w
n O
.
Pearce
Support '
p
u
s
h --dry-run' for http
t
ran
s
port
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-16
S
h
awn O
.
Pearce
Support
'
push --dry
-
r
u
n'
f
or rsync transport
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-16
Shawn O
.
Pearce
Fix 'p
u
s
h
--
a
l
l
branch
.
.
.
' error ha
n
dling
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-16
Shawn
O
.
Pearce
Merge branch 'master' into db/fetc
h
-
p
ack
commit
|
commitdiff
|
tree
2007-10-16
Shawn O
.
Pearce
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-10-16
Shawn O
.
Pearce
W
hip post 1
.
5
.
3
.
4 m
a
inte
n
an
c
e
series
i
nto shape
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-14
Sh
a
w
n
O
.
P
e
ar
c
e
git-gu
i
: Hon
o
r a
c
onfig
.
mak i
n
git-gu
i
's to
p
level
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pea
r
ce
git-
g
ui: Collap
s
e
$env(HOM
E
)
to ~/
in rece
n
t reposito
r
i
e
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pearce
g
it-g
u
i: Su
p
port
cl
o
ning C
y
gwin ba
s
ed work-dirs
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pearce
git-gui: Use prop
e
r
Win
d
ows shortcuts instea
d
of bat
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Sha
w
n O
.
Pearce
git
-
g
ui: Ensure copy
r
i
g
h
t messag
e
is cor
r
ectly read
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shaw
n
O
.
Pearce
git-gui: Bind n/c/o ac
c
elerators in reposito
r
y
chooser
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shawn
O
.
Pear
c
e
git-
g
ui: Disable
t
he t
e
xt widget in t
h
e
repository
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pea
r
ce
git-gui: Fi
x
bind errors when switching r
e
posi
t
ory
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
Pearce
git-gui: Offer
repository management featu
r
es in m
e
nu bar
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
Pearce
g
it-g
u
i: Change repository browse
r
ra
d
io buttons
t
o
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
P
e
a
r
ce
git-gui:
Sup
p
or
t
LFs embedded in config f
i
le values
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn
O
.
Pearce
git-
g
ui
:
Refac
t
or git-confi
g
--list
p
arsing
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
Pearce
gi
t
-gui: Move l
o
ad_c
o
nfig pro
c
edure below git
-
versio
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
S
hawn O
.
Pearce
gi
t
-gui: Updated po strings based on current sources
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pea
r
ce
M
e
r
ge bran
c
h 'cs/de'
commit
|
commitdiff
|
tree
2007-10-10
Shawn
O
.
Pearce
g
i
t-gui: Shorten
t
he staged
/
u
n
staged changes title
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shawn
O
.
P
e
a
r
ce
git-gui
:
Bind Cmd-, to P
r
eferences on Mac OS
X
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shaw
n
O
.
Pearc
e
git-gu
i
:
Co
n
soli
d
ate t
h
e Fetch and Push
m
enus into
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shawn
O
.
Pear
c
e
git-gui: Use
prog
r
e
ss
meter in
t
he
status
ba
r
during
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
S
hawn O
.
Pearce
g
i
t-gu
i
: Include our
G
i
t
log
o
in t
h
e abo
u
t
dialog
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Sha
w
n
O
.
Pearce
git-gui: R
e
fa
c
tor about dialo
g
c
o
d
e into its own module
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pear
c
e
git-gui: Refactor Henri
k
Nyh'
s
lo
g
o into its own procedure
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shaw
n
O
.
Pearce
Merge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-10-03
Shawn O
.
Pearce
git-gui: Allow f
o
r
ced p
u
sh in
t
o remote reposit
o
ry
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-03
Shawn O
.
Pearce
M
e
r
ge
branch
'maint'
commit
|
commitdiff
|
tree
2007-10-03
S
h
aw
n
O
.
Pearce
git-g
u
i: Don
'
t cra
s
h when starting gitk from a browser
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-03
Shaw
n
O
.
Pear
c
e
git
-
gui: All
o
w gitk
to
be star
t
ed on Cygwin with
na
t
ive
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-28
Sha
w
n
O
.
Pearce
git-gui: Ref
e
r
to ourselves as "Git Gui" and
n
ot "gi
t
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-28
S
h
awn O
.
Pearce
g
i
t
-
gui: Suppor
t
a native Mac OS X app
l
ication
b
undle
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-28
Shawn O
.
Pearce
git-g
u
i
:
Us
e
Henrik N
y
h's git log
o
i
con o
n
Wi
n
dows
.
.
.
Signed-off-by:
Shawn O. Pearce
<shawn.o.pearce@bankofamerica...
commit
|
commitdiff
|
tree
2007-09-26
Shawn
O
.
Pearc
e
git-
g
ui: Make
t
he status bar easier to r
e
ad
i
n
the
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-26
Shawn
O
.
P
e
arce
git-gui
:
Switch th
e
git
-
g
u
i
logo to Henrik Ny
h
's logo
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-26
Shawn O
.
Pe
a
rce
g
i
t
-
gui: Don't
d
elete scr
o
llbars i
n
console wi
n
dows
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-26
Shawn O
.
Pearce
g
i
t-gui:
D
on't delete c
o
nsole window namespac
e
s
t
oo
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
Shawn O
.
Pearce
Prevent send-pack
f
r
o
m segfau
l
t
ing
w
he
n
a branch does
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
Shawn
O
.
Pearce
Clea
n
u
p
unne
c
essary break in remote
.
c
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
Shawn O
.
Pearce
Cleanup s
t
yle nit of 'x
==
NU
L
L
' in remote
.
c
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
Shawn O
.
Pearce
git-gu
i
: Co
p
y objects/info/alter
n
ates d
u
ri
n
g standa
r
d
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
Shawn O
.
P
earce
g
i
t
-g
u
i: Keep t
h
e UI responsive while counting objects
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
S
hawn
O
.
P
earce
g
it-gui: Don't b
o
ther showing OS erro
r
message
abou
t
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-23
Sha
w
n O
.
Pea
r
ce
g
i
t-gui: Avoi
d
c
o
n
s
o
le
scrol
l
bars unles
s
they are
necessary
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-23
Shawn O
.
Pearce
g
i
t-gui:
A
llow users to
choose/create
/
cl
o
n
e a
repository
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pearce
git-
g
u
i
: Refactor som
e
UI i
n
it to oc
c
ur earlie
r
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pearc
e
M
erge
branch 'maint
'
commit
|
commitdiff
|
tree
2007-09-22
Shawn
O
.
P
earce
git-gu
i
: E
n
sure
.
git/in
f
o/exclude
is ho
n
ored
in C
y
gw
i
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pearce
g
it
-
gu
i
: Handle s
t
arting on mapp
e
d
sh
a
res under Cygwi
n
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next