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
remove vim syntax highlighting in favor of upstream
2008-09-30
SZEDER Gábor
remove vim syntax
h
ighli
g
hting in favor o
f
upstream
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearc
e
Merg
e
b
ranch
'bc/mas
t
er-diff-hunk-heade
r
-fix'
commit
|
commitdiff
|
tree
2008-09-29
S
hawn
O
.
Pear
c
e
Merge bra
n
c
h
'
main
t
'
i
n
to bc/master-d
i
ff-hunk-header-fi
x
commit
|
commitdiff
|
tree
2008-09-29
Shawn
O
.
Pearce
Me
r
ge branch
'
b
c
/mai
n
t-diff-hunk-
h
eader-fix' into
maint
commit
|
commitdiff
|
tree
2008-09-29
Sh
a
wn
O
.
Pearce
Me
r
ge branch 'jc/be
t
ter-conflict-resol
u
t
i
on
'
commit
|
commitdiff
|
tree
2008-09-29
Sh
a
w
n O
.
P
earce
Me
r
g
e branch 'mg/maint-
r
em
o
te-fix' in
t
o maint
commit
|
commitdiff
|
tree
2008-09-29
Nanako
Shiraishi
Add cont
r
ib/rerer
e
-train
s
crip
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Rafael
Garcia-Su
a
rez
Clari
f
y com
m
it error message for unmerged
files
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
Use s
t
rchrnul() i
n
s
t
ead of str
c
hr() pl
u
s manual workaro
u
n
d
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Dmi
t
ry Potapov
mingw: remove
use of
_get
d
r
ive() from l
s
t
a
t/f
s
t
a
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Alex Riesen
Use remove_p
a
th fr
o
m dir
.
c
ins
t
ead of
own
i
mplementation
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Alex Riesen
Add
r
e
m
ove_path: a f
u
n
ction to re
m
o
v
e
a
s much as possible
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
P
ing
Y
in
g
it-submodule: Fix "
U
nable
t
o
checkout" for
t
he in
i
tial
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
J
o
ha
n
nes
Sixt
c
o
mpat/mi
n
gw:
S
u
pport
a
t
i
meout in the poll
emulation
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
St
e
p
h
en
H
aberman
Cl
a
rify how the
u
ser can satisf
y
stash's 'dirty state
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Nanak
o
Shiraishi
usage
.
c
: re
m
ove unused f
u
nctions
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Shawn O
.
Pear
c
e
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-26
Alex
Ri
e
sen
Cleanup
remove_path
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Alex Ri
e
s
e
n
R
emo
v
e e
m
pty
directories in recursive m
e
rge
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Chris Frey
D
o
cumenta
t
ion: clarify the details of overriding LE
S
S
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
S
h
awn O
.
Pearce
M
e
rge branch 'mv/merge-recursive'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Mer
g
e
bran
c
h
'
jc/alternate-push'
commit
|
commitdiff
|
tree
2008-09-25
Shaw
n
O
.
Pearce
Merge branch
'am/status'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearc
e
Me
r
ge branch 'pb/a
u
tocorrect-wrapper'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn
O
.
Pearce
M
erg
e
branch
'
mv/com
m
i
t
-tree'
commit
|
commitdiff
|
tree
2008-09-25
Sha
w
n O
.
Pearce
Mer
g
e br
a
nch 'jc/apply-
i
nclude-e
x
clude'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge branch 'jc/
s
afe
-
c-l-d'
commit
|
commitdiff
|
tree
2008-09-25
Giuseppe
Bilotta
g
i
tw
e
b: s
h
or
t
log n
o
w also ob
e
ys $
h
as
h
_parent
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Sha
w
n O
.
Pearc
e
Merge branch '
h
o
/
d
irstat-by-f
i
le'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn O
.
Pearce
M
e
rge gi
t
://rep
o
.
o
r
.
c
z
/git
-
gu
i
commit
|
commitdiff
|
tree
2008-09-25
S
haw
n
O
.
P
e
a
r
c
e
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Updat
e
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 sub
m
odu
l
e
sync with rel
a
tive
s
u
bmod
u
le URLs
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Nanako
S
hiraishi
gra
p
h
.
c: make
m
any f
u
nctions static
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Nanak
o
S
hi
r
a
i
s
hi
remote
.
c: ma
k
e free_r
e
f(), parse_push
_
r
e
f
spec() and
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Jo
n
a
s
Fonseca
ch
e
ckou
t
: Do not show local changes when in quiet mode
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
for-each
-
ref
:
Fix --forma
t
=%(subject) for lo
g
mes
s
age
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Petr Ba
u
d
i
s
g
i
t
-web--b
r
owse
:
Su
p
p
o
r
t for using
/bin/start
on
MinGW
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexand
e
r Ga
v
r
i
lov
gi
t
-gui: Reenable staging un
m
erged files
b
y clicking
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alex
a
nder
Gavrilov
g
it-gui: Suppo
r
t the encoding men
u
i
n
gui blame
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exand
e
r
Gavrilov
git-gui: Optimize encodin
g
name
res
o
l
ution using a
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alex
a
nder Gavrilov
gi
t
-gui: Allow forcin
g
di
s
play encoding f
o
r diffs using
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exander
G
avrilov
git-gui
:
Ad
d
a
m
e
n
u of availabl
e
encod
i
ngs
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexan
d
er Gavrilov
git-gui: Cle
a
nup ha
n
dling of the default encodi
n
g
.
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
cr
e
ment
a
l` outp
u
t is in
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
git-gui: Use gita
t
t
ribute "enc
o
ding" for file conte
n
t
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Joshua Williams
git-
g
ui: A
d
d
support f
o
r c
a
lling ou
t
t
o the prepare
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Shaw
n
O
.
Pearce
git
-
gui: Hide comm
i
t relat
e
d UI
d
u
ring
c
itool --nocommit
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander
G
avrilov
git-gui: Add more integration
o
ptions
to
c
it
o
ol
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Brandon Casey
git-stash
.
sh: don't defaul
t
t
o refs/
s
ta
s
h if inv
a
lid
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Garry Dolley
Fixed some grammatic
a
l
errors in g
i
t-rebas
e
.
txt do
c
umentat
i
on
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Deskin Miller
m
a
int: check return of s
p
lit
_
cmdline to avoid bad confi
g
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-13
C
h
r
istian Stimmi
n
g
git-gui: Upda
t
ed
German
tra
n
s
l
ati
o
n
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-05
Shawn
O
.
Pearce
git
-
gui
:
Fi
x
dif
f
par
s
ing
for lin
e
s starting
w
ith
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Ale
x
ander
G
avrilov
git-gui:
Sho
w
special diffs for complex
c
onf
l
ict
c
a
ses
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui: Make F5 reselect
a
d
iff, if an untracked file
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavr
i
lov
g
i
t-gui:
R
eimp
l
ement
and enha
n
ce auto-sel
e
ction of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
e
r G
a
vrilov
g
i
t-gui:
S
up
p
ort conflict
s
tates _U
&
UT
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-
g
ui:
S
upport m
o
r
e
merge tools
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Al
e
xander
Gavrilov
g
i
t
-
gui: Don
'
t allow staging
file
s
w
i
th c
o
n
flicts
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
A
lexander Gavril
o
v
git
-
g
u
i: Supp
o
rt calling merge tool
s
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander
Gavrilov
g
i
t-gu
i
: Supp
o
rt res
o
lvin
g
conf
l
ic
t
s via the diff context
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Chri
s
tian Stimming
git-gui: Mark forgotten strings for translation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-01
Shawn O
.
Pearce
Merge
b
ranc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2008-09-01
Al
e
xander
G
avr
i
lov
g
i
t-
g
ui: Fix str
i
n
g
escaping in po2
m
sg
.
sh
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-01
Clemens
B
uchac
h
er
git
g
ui: show
diffs with a
m
inimum
o
f
1 co
n
t
e
xt l
i
n
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Al
e
xand
e
r
Gav
r
ilov
g
i
t-gui: Allo
w
spe
c
ifyi
n
g an initia
l
line for git gui
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Al
e
xander Gavr
i
lov
git-gui
:
Better positioning
in
Blame Parent Com
m
it
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Ale
x
ander Gavrilov
g
it-gui: Support passing
blame to a pare
n
t
commit
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Alexand
e
r G
a
v
r
il
o
v
git-gui: S
u
pport starting gitk from Gui
B
la
m
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Gustaf Hendeby
git-gui: Tea
c
h gi
t
g
ui
a
b
o
u
t file type chan
g
es
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-13
Alexandre Bour
g
et
git-gui: update all rema
i
nin
g
tra
n
slatio
n
s to F
r
ench
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-13
Alexandre Bourget
git-gui: Upd
a
te french transl
a
tion
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-10
Shawn O
.
Pearce
git-gui 0
.
11
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-05
J
o
hannes Sixt
git-gui: Adapt
disc
o
v
ery of oguilib to execdir
'
libexec
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
Michele Ballabio
g
it-gui: add a part
a
b
out fo
r
mat stri
n
g
s
in p
o
/
R
EAD
M
E
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
Michele Bal
l
ab
i
o
git-gui: u
p
date po/it
.
p
o
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
しらいしななこ
git-gu
i
: update Japan
e
s
e
transl
a
tion
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
Mikael Magnusson
g
i
t-gui: Update swedish translati
o
n
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
Shawn
O
.
Pearc
e
git-gui: Upda
t
e git
-
gui
.
pot for 0
.
11 ne
a
r
ing release
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
C
h
ristian Stimming
git-gui: Update German
tr
a
n
sla
t
ion
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Steffen Prohaska
git-gui (Windows): Ch
a
nge wr
a
pper to execdi
r
'libexec
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
St
e
f
fen Prohaska
gi
t
-
gui (Window
s
)
: Swit
c
h
t
o rel
a
tive discovery of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Steff
e
n Pr
o
haska
git-gui: Correc
t
ins
t
allation of library to be $prefix
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Shawn O
.
Pearce
git-gui: Fix
gitk
s
earch in $P
A
T
H to w
o
rk on Windows
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-27
Alexander Gavrilov
gi
t
-gui:
Preserve
s
cr
o
l
l
positio
n
on re
s
how_
d
iff
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-27
Alexander Gavrilov
git-gui: Fix the Remote menu separator
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-26
Jo
h
annes Sixt
git-gui: "Stag
e
Line": Treat i
n
de
p
e
n
dent ch
a
n
ges in
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
git-gui:
F
i
x "Stage/
U
nstage Line" wi
t
h
o
n
e
line of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-25
S
h
awn
O
.
Pe
a
rce
git-gui: Correct 'Visu
a
lize Branches
'
on Mac OS X to
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-25
Abhijit Meno
n
-Sen
g
it-gu
i
: Look
f
or gitk in $PATH, not $LIBEXEC/git-co
r
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
Alexa
n
der Gavrilov
Add
a
menu item to invoke full
c
opy dete
c
tion
in bla
m
e
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gav
r
ilov
Kill th
e
blame back-end on window close
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
A
l
exander G
a
vril
o
v
A
dd options to con
t
ro
l
the
search f
o
r copies in
b
lame
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
A
lexander Gav
r
ilov
F
ix pre-commit hoo
k
s un
d
er MinGW/M
S
YS
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-13
Jo
h
ann
e
s
Schindelin
git-gui: MER
G
E_R
R
liv
e
s in
.
gi
t
/ direc
t
ly with newer
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-08
Soeren Fin
s
ter
git-gui: Exit sh
o
rtcut in MacO
S
X re
p
a
ir
e
d
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-02
Johannes Six
t
git-gui: Implement "S
t
age/Unst
a
ge
L
ine"
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-06-25
Abhijit Menon-S
e
n
git-gui: Don't select the wrong file if the last listed
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
next