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 'bc/master-diff-hunk-header-fix'
2008-09-29
Shawn
O
.
Pearce
Mer
g
e branch '
b
c/master-di
f
f-hunk-header-fi
x
'
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearce
M
erge
b
r
anch 'maint' into bc
/
maste
r
-diff-hunk-header-fix
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearce
Merge branch 'bc/
m
a
i
nt-di
f
f-hunk-h
e
ader-
f
ix' into mai
n
t
commit
|
commitdiff
|
tree
2008-09-29
Shaw
n
O
.
P
e
a
rce
Merge b
r
anch 'jc/better
-
conflict-
r
e
s
olutio
n
'
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearce
Merge branch
'
mg/maint-remote-fix' int
o
maint
commit
|
commitdiff
|
tree
2008-09-29
Nanako Shi
r
aishi
Add
contrib/rerere
-
train scrip
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Rafael Gar
c
i
a
-
Suarez
Cl
a
rify commit err
o
r message
f
or u
n
merged
files
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
Use st
r
chrnul() instead of strchr
(
) pl
u
s manual
w
orkaround
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Dm
i
try Potapov
mingw: remove u
s
e o
f
_getdrive() from
lstat/fs
t
a
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Alex Riesen
Use remove_path from dir
.
c instead of own implement
a
tio
n
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Al
e
x Riese
n
Add
remov
e
_path: a
f
u
nction to re
m
ove as much as
p
ossible
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Ping Yin
git-s
u
b
module: Fix "Unable
to checkout" f
o
r the init
i
al
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Johannes Sixt
compat/mi
n
gw: Support a timeout in the poll e
m
u
lati
o
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Stephen Haberman
Clar
i
f
y how
t
he user c
a
n
s
atis
f
y stash's 'dirty stat
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
N
a
nako Shiraishi
u
s
age
.
c
: re
m
o
ve unused fu
n
ctions
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Shawn
O
.
Pearce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-26
Alex Riesen
Cleanup remove_p
a
th
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Alex Riesen
R
em
o
ve
e
mpty direct
o
r
ies in r
e
cursive
merge
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
C
hr
i
s
Frey
D
ocumentation: clarif
y
the
d
e
tails of
overriding LESS
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
S
h
a
wn O
.
P
ear
c
e
Merge branch
'
m
v/merge-recursi
v
e'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge bra
n
ch
'
jc/a
l
ternate-push'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pea
r
ce
Merg
e
b
r
an
c
h 'am/status'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge bra
n
ch 'pb/
a
utocorr
e
ct-wrapper'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
w
n O
.
Pear
c
e
Merg
e
branch
'
m
v
/co
m
mit-tree'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
P
earce
Merge br
a
nch '
j
c/app
l
y-in
c
lude-exclude'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
P
e
arce
Merge branc
h
'jc/safe-
c
-
l
-d'
commit
|
commitdiff
|
tree
2008-09-25
Giuseppe Bilotta
gitweb:
shortlog now also obe
y
s $ha
s
h_p
a
re
n
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pearce
Merge branch 'ho/dirstat-by-fi
l
e'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearc
e
Merg
e
git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pea
r
ce
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Update
re
l
ease
notes for 1
.
6
.
0
.
3
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
Fix su
b
module syn
c
w
i
t
h rela
t
ive submod
u
le
U
RLs
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
N
a
nako Shiraishi
g
r
aph
.
c:
m
ake ma
n
y
functions static
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Nanako Shi
r
aish
i
r
emote
.
c: make free_re
f
(
), parse_push
_
refspec() and
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
J
o
nas Fonse
c
a
check
o
ut:
Do not show loca
l
change
s
when in
q
u
i
et mode
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herlan
d
for-each-ref: Fix --format=%(subject) f
o
r log message
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Petr Baudis
git-web
-
-browse: Sup
p
o
r
t fo
r
using /bin/start on MinGW
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexande
r
G
avrilov
g
it-gui: Reenabl
e
st
a
ging unmerge
d
f
i
les by clicking
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander G
a
vrilov
git-gu
i
: Sup
p
ort t
h
e
enc
o
d
i
ng menu in gui blam
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexand
e
r Gavrilov
git-gui:
O
ptimize encoding name
r
esolution using a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander
G
avrilov
git-gui: Allow forcing display en
c
oding
fo
r
dif
f
s
u
sin
g
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander
G
avrilov
git-
g
ui: Add
a
menu
o
f available encodings
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exander
Gavrilov
git-gui: Cleanup hand
l
ing of the de
f
ault enc
o
ding
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
g
i
t-gui: Assume `blame --i
n
c
r
ement
a
l`
output is in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn
O
.
P
earce
git-gui: Use
gitattribute "encoding"
for file c
o
nte
n
t
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Joshua Willia
m
s
g
it-
g
ui:
A
dd
support for calling out to the pr
e
p
are
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn
O
.
Pearce
git-gui:
H
ide com
m
it related UI during
cito
o
l --nocommit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander
Gav
r
ilov
git-g
u
i: Add
m
ore integration op
t
ions
to
c
it
o
o
l
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Brandon Casey
git-stas
h
.
sh: don
'
t default
t
o refs/stash i
f
i
nvalid
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
G
a
r
ry Dolle
y
Fixed some
g
r
a
mmat
i
cal e
r
rors in git
-
rebase
.
txt doc
u
mentation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Deskin
Miller
m
aint: ch
e
ck
retur
n
o
f
split_cmd
l
i
n
e to
a
v
o
id ba
d
c
onfig
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-13
C
h
ris
t
ian Stimming
git-gui
:
U
pd
a
ted Ger
m
a
n translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-12
C
h
r
i
stian S
t
imming
git-gui: I18
n
fix sente
n
ce parts into full sentences
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alex
a
nder Gavrilov
g
i
t
-gui: Restore ability to Stage Working Copy for
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Al
e
xander Gavril
o
v
git-g
u
i
: Fix
B
lame Parent & Con
t
e
xt
f
or w
o
rking copy
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
P
e
arc
e
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pea
r
ce
git
-
gui
:
Fix diff par
s
ing for lines starting wi
t
h
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
l
ex
a
nder
Gavri
l
ov
git
-
gui: Sh
o
w spec
i
al
diffs for
complex confl
i
ct
c
ases
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavr
i
lo
v
git-gui: Make F5 reselect
a
diff,
if an untracked file
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Ale
x
ander G
a
vrilov
g
i
t-gui: Reimplement and enhanc
e
auto-sel
e
ction of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Ga
v
r
ilov
git-g
u
i:
S
upp
o
rt
conflict states
_
U &
UT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
er Ga
v
rilov
git-gui:
Sup
p
or
t
more merge tools
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander
G
a
vril
o
v
gi
t
-gui:
Don'
t
a
llow s
t
aging
f
i
l
es w
i
th conflic
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander
G
avrilov
git
-
gui: S
u
pport
c
alling merge to
o
ls
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
er Gav
r
ilov
git-
g
ui: S
u
p
p
ort resolving c
o
nflicts via
t
he diff cont
e
xt
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Christian Sti
m
mi
n
g
git-gui: Mark forgotten stri
n
gs for
transla
t
ion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
Shawn O
.
P
ear
c
e
M
e
rge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-09-01
Alexander
Gavrilov
g
it
-
g
ui: Fix
s
t
r
i
ng escaping i
n
po2m
s
g
.
sh
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
Clemen
s
Buchach
e
r
git gui: show diffs with a m
i
nim
u
m of 1 co
n
text line
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Alexan
d
er Gavrilov
git-gui: All
o
w specifying an in
i
tial line for git gui
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Alexa
n
der Gavrilov
git-gui: Better positioni
n
g in Blame Parent Commit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Al
e
x
a
nder Ga
v
rilov
gi
t
-
g
ui
:
Suppor
t
passing bla
m
e to a parent commit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Alexander
G
avrilov
git-gui: Support starting gitk from Gui Blam
e
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Gu
s
taf He
n
deby
git-gui:
Tea
c
h git gui ab
o
ut file ty
p
e changes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-13
A
lexandre Bour
g
et
gi
t
-gui: upda
t
e all remaini
n
g translations
t
o
F
r
ench
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-13
Al
e
xandre Bou
r
get
git-gui: U
p
dat
e
f
renc
h
tra
n
slation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-10
Shawn
O
.
P
ear
c
e
g
i
t-
g
ui 0
.
11
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-05
J
ohannes Sixt
g
i
t
-
gui: Adapt d
i
scovery of oguilib to execdi
r
'libexec
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
Michele Ball
a
bio
git-
g
ui: add a part abou
t
format stri
n
gs in
p
o
/REA
D
ME
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
Michele B
a
llabio
git-gui: update p
o
/it
.
p
o
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
し
ら
いしななこ
git-gui: u
p
d
a
te J
a
panese translation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
Mik
a
el
Mag
n
us
s
on
git-gu
i
:
Update swedish translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
S
h
awn O
.
P
e
arce
git-gui: Update git-
g
ui
.
pot for 0
.
11
nearing release
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
Ch
r
istian
S
timming
git-gui
:
Update Ger
m
a
n
tran
s
lation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Steffen Proh
a
ska
git
-
gu
i
(Wi
n
d
ows): Change w
r
apper to execdir
'libexec
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
S
t
effen Prohaska
git-gui
(
W
i
ndows): Switch to
relative discovery of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
S
t
e
ffen Prohaska
git-
g
ui:
Correct in
s
tallation
o
f library to be $prefi
x
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
S
h
a
wn O
.
Pearce
git-gui: Fix
gitk search in $
P
ATH to w
o
rk on
W
i
n
d
o
ws
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-27
Alexande
r
Ga
v
ril
o
v
gi
t
-gui: Preserve scr
o
ll position on
reshow_diff
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-27
Alexander Gavrilov
g
it-gu
i
: Fi
x
the Rem
o
te m
e
nu separa
t
or
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-26
Joh
a
nnes
S
ixt
git-gui: "Stag
e
L
i
ne":
Tre
a
t i
n
depe
n
dent
c
hanges in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
S
i
xt
git
-
g
u
i: Fix
"
Stage
/
Unsta
g
e
L
i
ne
"
with one line of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-25
Shawn O
.
Pearce
git
-
gui: Co
r
rect
'Visualize Br
a
n
c
hes' o
n
Mac OS
X
to
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-25
Abhijit Me
n
o
n-Sen
git-gui
:
Look for gi
t
k in $PATH, not $
L
IBEXEC/git-core
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-17
A
lex
a
nder Gav
r
ilov
Add
a
m
enu ite
m
to in
v
oke full cop
y
detecti
o
n in bla
m
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-17
A
le
x
ander
Ga
v
rilov
Ki
l
l the blame ba
c
k-en
d
on win
d
ow clos
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gavrilov
A
d
d
optio
n
s to c
o
ntrol
t
h
e search for
copies
i
n b
l
am
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-17
A
l
ex
a
nder Gavrilov
Fix
pre-com
m
i
t
hooks under MinGW/MSYS
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-13
Jo
h
annes Schindelin
git
-
gu
i
:
M
ERGE_RR lives in
.
git/ directly with
n
ewer
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-08
S
o
ere
n
Finster
git-gui:
Ex
i
t
shor
t
cu
t
in
Ma
c
O
SX repaire
d
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next