repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/objc-funchdr'
2008-09-29
S
h
aw
n
O
.
Pearce
Merge branch 'jc
/
bet
t
e
r
-conflict-resolution'
commit
|
commitdiff
|
tree
2008-09-29
S
hawn O
.
P
earce
Merge b
r
anch 'mg/maint-remote-fix' into maint
commit
|
commitdiff
|
tree
2008-09-29
N
anako Shir
a
ishi
Ad
d
c
ontrib/rerere-train script
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
R
a
f
ael Ga
r
cia-Suarez
C
lari
f
y commit
error
me
s
sage for unm
e
rged
f
iles
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Johan Her
l
an
d
Use s
t
rchrnul() instead
of strchr() pl
u
s manua
l
workaround
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Dmitry
P
ota
p
ov
mingw: re
m
ove us
e
of _g
e
tdrive() fr
o
m lstat/f
s
tat
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Alex Riesen
Use remove_path fr
o
m d
i
r
.
c inste
a
d
of own imp
l
ementa
t
ion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Alex Riesen
Add remov
e
_path: a function
to
r
emove as much
a
s possibl
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Ping Yin
g
it-submodule
:
F
ix "Unable to che
c
k
out
"
for the initial
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
J
o
han
n
es Sixt
compat/mingw: Su
p
po
r
t a
ti
m
eout in the poll emulation
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Stephen Ha
b
er
m
a
n
Clarify how
t
he user can sa
t
isfy stash'
s
'
d
irty state
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Nanako Sh
i
raishi
u
s
age
.
c
:
r
e
move unused
function
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Shawn O
.
Pearce
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-09-26
Alex Riesen
Cleanup
remo
v
e_path
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Alex Rie
s
en
Rem
o
ve empty directories in rec
u
rsive merge
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Chris Frey
D
o
cumen
t
ation: c
l
arify t
h
e details of
o
v
er
r
iding LESS
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn O
.
Pearce
Merge branch 'mv/merge-recursive'
commit
|
commitdiff
|
tree
2008-09-25
S
hawn O
.
P
earc
e
Merg
e
bra
n
ch
'jc/alternate-push'
commit
|
commitdiff
|
tree
2008-09-25
S
hawn O
.
Pearce
Merge branch 'a
m
/stat
u
s'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pearc
e
Merg
e
branch 'pb/autocorrec
t
-wrapp
e
r
'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pearce
Merge branch
'
mv/commit
-
t
re
e
'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merg
e
branch
'
j
c/apply
-
include-e
x
clude'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn O
.
Pearce
Merge bra
n
ch 'jc/safe-c-l-d'
commit
|
commitdiff
|
tree
2008-09-25
Giusep
p
e Bilo
t
ta
gitw
e
b: s
h
ortlog now also obeys $hash_pare
n
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge br
a
nch 'ho
/
dirs
t
a
t
-
by-
f
i
le'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge git://repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
P
e
arce
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-09-25
S
hawn O
.
P
e
arce
Upd
a
t
e
release notes for 1
.
6
.
0
.
3
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
Fix submodule sync with
r
e
l
a
t
i
ve
submodule URLs
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
N
anako S
h
i
r
a
i
s
hi
graph
.
c: ma
k
e many functions stat
i
c
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Nana
k
o Shirai
s
hi
r
emote
.
c
:
make free_ref(), parse_push_refs
p
ec() and
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
J
o
n
as Fonseca
che
c
kout: Do no
t
sho
w
local changes when in qui
e
t mode
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Joh
a
n Herland
for-ea
c
h-ref: Fix --for
m
at
=
%(su
b
ject)
for l
o
g m
e
ssage
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
P
etr
Baudi
s
gi
t
-w
e
b--browse: Support f
o
r u
s
ing /bin/start on
MinGW
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexa
n
der Gavrilov
gi
t
-gui
:
Reenable
s
t
aging un
m
erged fi
l
e
s
b
y c
l
icking
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexand
e
r Gav
r
il
o
v
git
-
gui:
S
upport the
encoding
m
enu in gui blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
lex
a
nder Gavrilov
git-gui: O
p
t
i
mize encodin
g
nam
e
resolution usi
n
g a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavr
i
lov
git
-
g
u
i
: Al
l
ow forcing disp
l
ay encoding for diffs
using
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exander Gavri
l
ov
git-gui: Add a menu of available e
n
codings
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Ale
x
ande
r
G
avrilov
git-gui:
Cleanup handling of the
def
a
ult encod
i
ng
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shaw
n
O
.
P
e
a
r
ce
g
it-gui: Ass
u
me `b
l
ame --inc
r
emental` outpu
t
is in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shaw
n
O
.
Pearce
git-
g
u
i: Use gitat
t
ribu
t
e "encod
i
n
g
"
for fi
l
e
co
n
tent
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Joshu
a
Wi
l
liams
git-gui: Add support for
cal
l
ing o
u
t to the prepa
r
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
S
hawn O
.
Pe
a
rce
git
-
g
u
i: Hide
c
ommit related UI
d
uring
citool --
n
ocommit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-g
u
i: A
d
d
more
i
nte
g
rati
o
n options
to citool
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Brandon Casey
gi
t
-stash
.
sh: don't def
a
ult to refs/stash if invalid
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Garry Doll
e
y
Fixed some
g
rammatical err
o
rs
in git-
r
e
b
ase
.
t
xt
documentation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Deskin Mille
r
maint: check
r
eturn of
s
p
lit_cmdline to avoid bad co
n
fig
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-13
Christian Stimming
g
i
t-gui: Updated Germ
a
n
transla
t
io
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-12
Chr
i
st
i
an S
t
i
m
m
ing
gi
t
-gui:
I
18n fix
sentence
p
arts in
t
o
f
ul
l
sentences
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
A
lexander Gavrilov
git-gui:
R
estore ability to Stage Wor
k
in
g
Copy for
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexa
n
der
G
avrilo
v
git-
g
ui: Fix Bla
m
e
P
ar
e
nt &
C
ontext
fo
r
wor
k
ing cop
y
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-05
Shawn
O
.
Pearce
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
git-gui
:
Fix diff parsing
for lin
e
s starting with
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
l
e
xander Gavrilov
git-gui: Show special diffs for
comp
l
ex conflict cases
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander
Gavril
o
v
git
-
gui:
M
ake F5 resele
c
t a di
f
f, if
a
n
untracked f
i
le
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
lexand
e
r Gavrilov
git-gui: Reimpleme
n
t and enha
n
c
e
a
u
to-sel
e
ction of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexand
e
r G
a
v
r
ilov
git-gui
:
Suppor
t
conflict states _U
&
UT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nder
G
av
r
ilov
git-gui:
Support mor
e
m
e
r
ge
t
o
ols
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui: Don't
a
l
l
ow staging fil
e
s with
con
f
lic
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander
Gavrilov
git-gui
:
S
u
p
p
ort
c
allin
g
me
r
ge too
l
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Ga
v
rilov
git-gui:
S
upport resolvi
n
g confl
i
cts
via th
e
diff
context
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Christia
n
S
t
imming
git-gui: Ma
r
k forgotten
s
trings fo
r
translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
Shawn O
.
P
e
arce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-01
Alexander
Gav
r
il
o
v
git
-
gui: Fix string escaping
in
p
o2msg
.
sh
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Buc
h
ac
h
er
git gui: sh
o
w
d
iffs with a
m
inimum of 1 context line
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Ale
x
ander G
a
vrilov
git-gui:
A
ll
o
w specif
y
ing an
i
ni
t
i
al
l
i
ne for git gui
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
A
lexander Gavri
l
ov
git-gui:
Better positioning
i
n
Blam
e
P
a
r
ent C
o
mmi
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
A
l
exande
r
G
a
vrilov
gi
t
-gui
:
Supp
o
rt passing blame to a
parent commit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
A
le
x
ander
G
avrilov
g
i
t-gu
i
: Supp
o
rt starting gitk
from Gui
B
lame
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Gusta
f
Hend
e
by
git-gui: Teach
g
it gui a
b
out file
t
ype changes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-13
Alexandre Bourget
g
it-gui: update
all
r
emaining translations to
French
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-13
A
l
e
xandre Bourge
t
git-
g
ui: Upd
a
te fren
c
h tr
a
nsla
t
i
o
n
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-10
Sha
w
n O
.
Pearce
gi
t
-g
u
i
0
.
11
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-05
Johannes Sixt
gi
t
-
g
ui: Adapt d
i
scovery of og
u
ilib
t
o
e
xecdir 'lib
e
xec
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
Mic
h
ele Ba
l
labio
g
it-gui: add a pa
r
t
abo
u
t
forma
t
strings in po
/
README
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
Michele Bal
l
abio
git-gui: update po/it
.
po
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
しらいしななこ
g
i
t-
g
ui: update Ja
p
anese
t
ransl
a
ti
o
n
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
M
i
kael Magn
u
ss
o
n
git-
g
ui: U
p
date sw
e
dish
translati
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
Shawn O
.
P
e
arce
g
i
t
-gui: U
p
dat
e
git-gui
.
pot for 0
.
11 nearin
g
release
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
C
hri
s
tian St
i
mming
git-gui:
Updat
e
German tr
a
nsl
a
t
ion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Steffe
n
Prohaska
g
i
t-gui (Windows): C
h
ange
w
rappe
r
to execd
i
r 'lib
e
xec
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Steffe
n
P
rohaska
git-gui
(
W
indo
w
s):
Swi
t
ch
t
o relative
disc
o
v
e
ry of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Steffen
P
rohas
k
a
git-gui
:
C
orrect installation of libr
a
ry to b
e
$prefix
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Shawn O
.
Pearce
g
it
-
gu
i
:
F
ix gitk search in $PATH t
o
work on
W
indows
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-27
Al
e
x
ander Gavrilov
git-gui:
P
reserve scroll
position on r
e
show_diff
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-27
Alexander
G
a
vrilov
git-gui: Fix the Remote me
n
u separator
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
git
-
gu
i
:
"Stag
e
Line
"
: Tr
e
at independ
e
n
t
chan
g
es in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-26
J
o
hannes Sixt
git-
g
ui
:
Fix
"
S
t
age/U
n
s
t
age Line" with one line of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-25
Shawn O
.
Pearce
git-g
u
i: Cor
r
ect 'Visu
a
lize Branc
h
es' on Mac OS X to
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-25
A
bh
i
jit M
e
non-Sen
git-gui: L
o
ok for gitk in $PAT
H
,
not $
L
IBEXEC
/
g
i
t-
c
o
r
e
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-17
Alexand
e
r Gavri
l
ov
A
dd a menu i
t
e
m
to invo
k
e ful
l
copy dete
c
ti
o
n in blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-17
Alex
a
nder Gavr
i
lov
Ki
l
l
the blame back-end on win
d
ow close
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gavrilov
Add options to
c
o
ntrol the sea
r
ch for
c
opies
in
bl
a
me
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-17
Alexander
G
avrilov
Fix pre-commit hooks under MinGW/M
S
Y
S
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-13
J
o
han
n
es Sch
i
ndel
i
n
git-gui:
M
ERGE_RR lives in
.
git/
d
irectly with newer
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-08
Soeren Finster
git-gui:
Ex
i
t sho
r
tc
u
t
in MacOSX repair
e
d
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-02
Johann
e
s Sixt
git-g
u
i: Implement "Stage/Unstage Line"
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-06-25
Ab
h
ij
i
t
M
e
n
on-S
e
n
g
i
t
-gui: Don
'
t sele
c
t t
h
e wro
n
g file
i
f the last listed
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-06-21
Rich
a
rd Quir
k
git
-
gui: Fix accidental staged state t
o
ggl
e
when cl
i
cking
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next