repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2008-09-30
SZEDER Gábor
r
emove v
i
m syntax hig
h
lighting in favor of upstre
a
m
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
P
e
arce
Mer
g
e branch '
b
c/maste
r
-di
f
f-hun
k
-header
-
fix
'
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearce
Merge
branch 'maint' int
o
b
c
/
mas
t
er-diff-hunk-
h
eader-fix
commit
|
commitdiff
|
tree
2008-09-29
Sha
w
n O
.
Pearc
e
M
e
rge bran
c
h 'bc/maint-diff-
h
unk-header-fix' into mai
n
t
commit
|
commitdiff
|
tree
2008-09-29
Shaw
n
O
.
P
e
arc
e
Me
r
ge branch 'jc/
b
etter
-
confl
i
ct-resolution'
commit
|
commitdiff
|
tree
2008-09-29
Shawn
O
.
Pearce
Merge bran
c
h
'mg/maint-remote-fi
x
'
into maint
commit
|
commitdiff
|
tree
2008-09-29
N
anako Shirai
s
h
i
Add
contrib/rerere-train script
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Rafael Ga
r
c
ia-Sua
r
ez
Clarif
y
commit error message for
u
nme
r
ged files
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
Use s
t
rchrnul() instead of strchr() plus manual wo
r
karo
u
nd
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Dmitr
y
Po
t
apov
mingw: remo
v
e use
o
f _getdrive() from lstat/
f
s
t
a
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Alex Riesen
Use remove_path f
r
om dir
.
c instead of own implementation
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Alex
R
i
esen
Ad
d
remove_path: a funct
i
on
to remov
e
as much as possibl
e
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Pin
g
Yin
g
i
t-
s
ubmodule
:
F
i
x "Unable to checkout" f
o
r
the initi
a
l
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Johannes Sixt
compat/m
i
ngw: Sup
p
ort a timeout in
the poll emulati
o
n
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
St
e
phen Habe
r
man
Cla
r
i
f
y
how the user ca
n
s
a
t
i
s
fy stas
h
's 'dirty sta
t
e
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Nanak
o
Shiraishi
usage
.
c: remove unused
f
unctio
n
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Sh
a
wn O
.
Pea
r
ce
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-26
Alex Riesen
Cleanup re
m
ove_path
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
A
lex Ri
e
sen
Rem
o
ve empty direc
t
or
i
es in recurs
i
ve m
e
rg
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Chris Frey
Docu
m
entation: clarify the details of overriding LESS
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge bra
n
c
h
'
m
v/merge-
r
ecursi
v
e'
commit
|
commitdiff
|
tree
2008-09-25
Sha
w
n
O
.
Pea
r
ce
Merge
b
ranch 'jc/alterna
t
e-push'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge branch 'am/status'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
P
e
arce
Merge branch 'pb/a
u
to
c
orrect-wrapper'
commit
|
commitdiff
|
tree
2008-09-25
S
h
awn O
.
Pe
a
rce
Me
r
g
e
b
ranch 'm
v
/comm
i
t-tree
'
commit
|
commitdiff
|
tree
2008-09-25
S
hawn O
.
Pearc
e
M
erge branch
'jc
/
a
p
ply-includ
e
-
e
xcl
u
de'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearc
e
M
erge branch 'jc/s
a
f
e
-
c
-l-d'
commit
|
commitdiff
|
tree
2008-09-25
G
iu
s
eppe
B
i
lotta
gitweb: shor
t
log no
w
als
o
obeys
$
hash_parent
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
S
hawn O
.
Pearce
M
erg
e
branch 'ho/dirstat-b
y
-file'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge git://repo
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn O
.
Pea
r
ce
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pe
a
r
ce
U
pdate r
e
lea
s
e
n
otes for 1
.
6
.
0
.
3
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herlan
d
Fix su
b
modu
l
e sync with relative subm
o
dule URLs
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
N
a
nako Shiraishi
graph
.
c: make
m
an
y
functions
static
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Nanak
o
Shi
r
aishi
r
emot
e
.
c:
make free_
r
e
f(),
p
a
r
se_push_refspec() and
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Jo
n
as Fo
n
seca
c
h
eckout: Do not sh
o
w local
c
hanges when in quiet mode
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
f
or-each-ref: Fi
x
--format=%(subjec
t
)
f
o
r
log me
s
sage
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Pe
t
r Baudi
s
git-w
e
b--b
r
owse: Support for
u
sing /b
i
n/st
a
rt on
M
i
n
G
W
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexan
d
er Gavrilov
git-gui:
Reenable staging unmerged files by clicking
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexa
n
d
er Gavrilov
g
i
t
-
gu
i
: Su
p
port
th
e
en
c
o
ding me
n
u in g
u
i bl
a
me
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-g
u
i: Opt
i
mize
e
ncod
i
n
g
name resolution u
s
ing a
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exander
G
avrilov
git-gu
i
:
Allow forcing
d
isplay
encoding for diffs u
s
i
n
g
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-gu
i
: Add
a menu of avail
a
ble encodings
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavr
i
l
o
v
git-gui: Cleanup h
a
ndling of the defa
u
l
t
e
ncodin
g
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
S
h
awn O
.
Pearce
g
it
-
gui: Assum
e
`bl
a
me --incremental` out
p
ut
is in
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
P
ear
c
e
git-gui: Use gitattribute "encoding
"
for file
c
ontent
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Joshua
W
i
l
lia
m
s
gi
t
-gui:
A
d
d
support for callin
g
o
ut to the prepare
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
git-g
u
i
:
Hide commit r
e
lat
e
d
U
I durin
g
cito
o
l --nocommit
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexan
d
er Gavrilov
gi
t
-gui: Add more integration
options to ci
t
ool
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
B
ra
n
d
o
n
C
asey
git-stash
.
sh: don't default to refs/sta
s
h
i
f inval
i
d
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Garry Dolley
F
i
xed some gra
m
matical err
o
rs in git-rebase
.
t
x
t documentation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
D
eskin Mill
e
r
m
aint:
c
heck retu
r
n of split_cmd
l
in
e
to avoid ba
d
con
f
i
g
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-13
Chr
i
stian Stimming
git-gui: Upda
t
ed German translation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
S
h
awn O
.
Pe
a
r
c
e
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
gi
t
-gui
:
Fix
diff p
a
rsing
f
or
l
ines s
t
a
r
t
i
ng
with
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilo
v
git-gui: Show speci
a
l diffs for
c
o
mplex co
n
f
l
ict cases
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander G
a
v
r
ilov
git-gui: Mak
e
F5 reselect
a diff, if an untr
a
cked fil
e
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui
:
Reimplemen
t
and
e
nhance auto-se
l
ection of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavri
l
ov
git
-
gui:
S
up
p
ort con
f
l
i
c
t
states _U
&
U
T
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexand
e
r Gavrilov
gi
t
-
gui: Suppo
r
t more merg
e
too
l
s
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Ale
x
ander Gavrilov
git-gui: Don't allow s
t
aging files wi
t
h c
o
nf
l
icts
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Ga
v
rilov
g
i
t-gui: Su
p
port calling merge tools
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nder
G
avrilov
git-
g
ui: Su
p
p
o
rt re
s
olv
i
ng conflicts vi
a
the diff
c
ontex
t
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Christian Stimmi
n
g
g
i
t-gui: Mark forgotten strings for translation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-01
S
hawn O
.
Pearce
M
erge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-09-01
A
l
exander G
a
vri
l
ov
git-gu
i
: Fix s
t
ring escaping i
n
po2msg
.
s
h
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-01
Clemen
s
Buchac
h
er
git gui: show
diffs wi
t
h a minimum of
1
context
line
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
A
lexande
r
Gavrilo
v
gi
t
-g
u
i
: Allow
s
pecif
y
ing an initi
a
l line for git gu
i
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Alexander Gavrilov
git-g
u
i
: Better po
s
itioning in Blame Parent Commit
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Ale
x
a
nder Gavrilov
git-gui: Sup
p
o
r
t
passing
bl
a
me
t
o a parent commit
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Al
e
xander Gavrilov
git-
g
ui: Supp
o
rt s
t
arting
gitk
f
rom
Gui
Blame
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Gustaf Hend
e
by
git-gui: Teach gi
t
gu
i
about file type changes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-13
Ale
x
a
n
dre
B
o
urget
git-gui: update all remaining
t
r
a
nsla
t
ions to Frenc
h
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-13
A
l
exan
d
re Bour
g
et
git-gu
i
: Update french t
r
anslatio
n
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-10
Shawn
O
.
Pearce
git-gu
i
0
.
1
1
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-05
Johanne
s
Sixt
git-g
u
i:
Adapt disc
o
v
ery o
f
oguilib to exe
c
dir
'lib
e
xec
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mich
e
l
e Ballabio
git-gu
i
: add
a
part about
format st
r
ings
i
n po/README
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miche
l
e Ballabio
git-gui: update po
/
it
.
p
o
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
し
ら
いしななこ
git-
g
ui: update Japanese
t
r
ans
l
atio
n
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
Mik
a
e
l Magnusso
n
g
it-gui:
Update swedish translation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
Shawn O
.
Pearce
git
-
g
u
i: Update
git-g
u
i
.
po
t
for 0
.
11 near
i
ng r
e
leas
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
Christian Stimm
i
ng
gi
t
-
gui:
Update German transl
a
tion
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Steffen Pr
o
haska
git-gui (Windows): Cha
n
ge wrapper to execdir 'li
b
exec
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Steffen
Pr
o
haska
git-g
u
i (Windows)
:
Switch t
o
relati
v
e
discovery of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Steffen Prohask
a
git-gui: Correc
t
installa
t
ion of li
b
rary
t
o
be $
p
refix
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Shawn O
.
Pe
a
rce
git-gui: Fi
x
gitk search in $PAT
H
to
work on Wind
o
w
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-27
Alexa
n
der Gavrilov
g
i
t-gui:
P
reserve scroll
p
osition on reshow_diff
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-27
Al
e
xander
Gavrilov
git-g
u
i:
F
i
x the Remote menu separator
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
git-gu
i
:
"
Stage Line": Tr
e
at indepen
d
ent c
h
a
n
ges in
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-26
Johanne
s
Sixt
git-gui: Fix "Sta
g
e
/
Unstage Lin
e
" with one
l
in
e
of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-25
Shawn O
.
Pearce
git-gui: Co
r
rect 'Visual
i
ze
B
r
a
n
ches' on Mac OS
X
to
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-25
A
bhijit Menon-S
e
n
git-gui: Look for gitk
i
n $
P
ATH
,
not $LIBEXEC/g
i
t-core
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gavrilov
Add
a
menu
item to
i
nvoke
f
ull copy
detection in blame
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
Alexand
e
r Gavrilov
Kil
l
the b
l
a
m
e ba
c
k-end
o
n
win
d
ow
c
lose
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
A
l
e
x
a
n
der Gavrilov
Add options to contr
o
l the sear
c
h for copies in
b
la
m
e
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gavrilov
Fix
p
r
e-co
m
mit
h
ooks under MinGW/MSYS
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-13
Johannes Sc
h
indelin
git-
g
ui: MERGE_RR lives in
.
git/ di
r
e
c
t
ly with ne
w
er
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-08
S
oeren Fi
n
ster
git-g
u
i
:
Exit shortcu
t
in
MacOSX repaired
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-02
J
ohannes S
i
xt
g
i
t-gui
:
Implement
"
Stage/Unstage Lin
e
"
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-06-25
Abhi
j
it
Menon-Sen
g
i
t-gui
:
Don't select t
h
e wrong file if th
e
last listed
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
next