repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: refresh the index before calling a strategy
2008-10-03
Mikl
o
s Vajna
builtin-merge
:
re
f
r
es
h
the ind
e
x bef
o
r
e
c
al
l
i
ng a strate
g
y
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
David
A
guil
a
r
tests: add a testc
a
se for "git submodul
e
s
y
nc"
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Shawn O
.
Pearce
Merge
b
ranch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-10-03
N
i
c
o
la
s
Pit
r
e
fix openssl headers conflicting
w
ith cu
s
tom
SHA1 implementations
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Nanako Shir
a
ishi
archive
.
c
: make
archi
v
er static
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Na
n
ako Shiraishi
commit
.
c: ma
k
e read_graft_file() s
t
atic
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Na
n
ako Shirai
s
hi
confi
g
.
c: make
git_p
a
rse_
l
ong() s
t
atic
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Nanako Sh
i
r
a
i
s
hi
run-
c
ommand
.
c: r
e
move run_
c
ommand_
v
_o
p
t_cd()
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Nanako
Shiraishi
dir
.
c: make dir_a
d
d_
n
ame
(
) and d
i
r
_
a
dd_ignored() static
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Jaku
b
Narebski
g
itweb:
A
dd
p
ath_
i
nfo tests
t
o t/t950
0
-gitweb-standalone
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Jakub N
a
rebski
gitweb
:
Fix t
w
o
'uniniti
a
l
ized value'
w
arnin
g
s in git_tree()
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Petr Baud
i
s
gitweb: Identify all summary
m
etadata table rows
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
David Soria Parra
S
olar
i
s
:
Use
O
LD_ICONV to avoid compile
w
arnings
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Giuseppe Bilotta
git
w
e
b
: remove PA
T
H
_INFO fro
m
$my_url and $my
_
ur
i
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Petr Baudis
c
onfig
.
c: Tolerat
e
UTF8 BOM at the beginning of config
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-03
Petr Baudis
git
w
e
b: Quote non-di
s
pl
a
yable c
h
aracters
i
n h
e
x, not
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-01
Shawn O
.
Pearce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-10-01
m
artin f
.
krafft
Improve git-log docum
e
ntati
o
n wrt fi
l
e filters
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-01
SZ
E
DER Gábor
D
o
cum
e
ntation: remove '\
'
i
n fron
t
of s
h
ort opt
i
o
ns
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Shawn O
.
P
e
arce
Me
r
g
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-09-30
Luc Heinric
h
gi
t
-s
v
n: call
'fatal' correctly in
set-t
r
ee
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Michae
l
Pr
o
k
op
Replace svn
.
fo
o
.
org with svn
.
example
.
com i
n
g
it-
s
vn
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
B
r
andon Cas
e
y
diff
.
c: remove duplic
a
te bibt
e
x pattern introduced
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
D
a
vid Bryson
Use "
g
it_confi
g
_string" to simplify
"built
i
n-gc
.
c"
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Jeff King
tests: grep portab
i
l
i
t
y fixes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
J
onathan del S
t
r
other
A
d
d OS X support to t
h
e pre-a
u
to-gc example hook
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
S
Z
E
DER Gá
b
or
t002
4
:
a
dd
executable permis
s
ion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Ralf Wilde
n
hues
Corre
c
t typo
s
in
R
el
N
otes-1
.
6
.
1
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
SZEDER Gábor
remo
v
e vim s
y
n
tax
h
ighlight
i
ng in
f
avor of upstrea
m
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearce
Merge bran
c
h 'bc/mast
e
r-diff-hunk-h
e
ade
r
-fix'
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearce
Me
r
g
e branch 'maint' into bc/master-d
i
ff-h
u
n
k-header-fix
commit
|
commitdiff
|
tree
2008-09-29
Sh
a
wn O
.
P
e
arce
Merg
e
branch '
b
c/maint-d
i
ff-hunk-heade
r
-fix' into main
t
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pea
r
c
e
M
erge branch 'jc/
b
et
t
er-confli
c
t
-
resolution'
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearce
Merge
branch 'mg/maint-remote-fix'
i
nto m
a
i
nt
commit
|
commitdiff
|
tree
2008-09-29
Nanak
o
Shiraishi
Add contrib/rerere-train script
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Rafael G
a
rcia-
S
uarez
Cl
a
ri
f
y commit erro
r
mes
s
age f
o
r u
n
m
erged files
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
J
ohan
Herland
Use strchrnul() instead of
s
t
rchr()
plus manual
w
ork
a
round
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
D
mitry Potapov
mi
n
gw: remove use o
f
_ge
t
drive() from
lstat
/
fsta
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Al
e
x
Riesen
Use remove_path from dir
.
c inste
a
d of own i
m
p
lementation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Ale
x
Riesen
A
d
d remove_path: a function to
r
emove as much as possi
b
le
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Ping Yin
git-
s
ubmo
d
ul
e
: F
i
x "Unab
l
e to c
h
eckout
"
for the initial
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Johanne
s
Sixt
compat/mingw: Support
a timeout in
the pol
l
e
mulation
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Stephen
Haber
m
an
Clari
f
y ho
w
t
h
e user can
satis
f
y
s
t
a
sh's
'dirty
st
a
te
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Nanako Shir
a
ishi
usage
.
c: remov
e
unused functions
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Shawn O
.
P
earce
Merge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2008-09-26
Alex Riesen
Cleanup remov
e
_path
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
A
lex Riesen
R
emove empty directo
r
ies in recursive
m
erge
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Chris
F
r
ey
Doc
u
m
e
ntation: clarify the
detai
l
s o
f
o
v
errid
i
ng
L
ESS
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
P
earce
Merge branch '
m
v/merge-rec
u
rsiv
e
'
commit
|
commitdiff
|
tree
2008-09-25
Sha
w
n O
.
Pe
a
rc
e
Merge branch 'jc/alt
e
r
nate-push'
commit
|
commitdiff
|
tree
2008-09-25
Shaw
n
O
.
Pearce
Merge branch 'am/s
t
atus'
commit
|
commitdiff
|
tree
2008-09-25
S
h
awn O
.
Pearce
Merge
b
ra
n
ch 'p
b
/
a
ut
o
corre
c
t-wrappe
r
'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pe
a
r
c
e
Me
r
ge bran
c
h
'
mv/commit-tree'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge br
a
nc
h
'jc/apply-in
c
lu
d
e-exclude'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn O
.
P
e
a
rce
Merg
e
b
r
a
n
ch '
j
c/saf
e
-c-l-d'
commit
|
commitdiff
|
tree
2008-09-25
Gius
e
p
pe
B
i
lo
t
ta
gitweb
:
shor
t
log now also obeys $hash_p
a
r
e
n
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
P
earce
Merge branch 'ho/d
i
rstat-by-file'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
P
e
arce
Merge git:
/
/repo
.
or
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2008-09-25
S
h
awn O
.
P
ea
r
ce
Merge
b
ran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Update
r
elease no
t
es for
1
.
6
.
0
.
3
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herla
n
d
Fix subm
o
dule syn
c
with relative submodule
URL
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Nan
a
ko Shiraishi
grap
h
.
c: mak
e
man
y
functions
s
tatic
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Nanako
S
hir
a
ishi
rem
o
te
.
c: make free_
r
ef(), pars
e
_push_refsp
e
c() and
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Jonas Fon
s
eca
ch
e
ckout: Do not show local changes when
in quiet mo
d
e
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
f
o
r-each-ref: F
i
x --format=%(subject) for log message
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Petr
Ba
u
dis
git-web--browse: Support f
o
r
using /bin
/
start on MinGW
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Ale
x
ander Gavrilov
g
i
t-gu
i
: Reenable stag
i
ng unmerge
d
f
iles by clicking
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Ga
v
ri
l
ov
git-gui: S
u
p
port the enc
o
di
n
g
m
enu in
g
ui blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavr
i
l
o
v
gi
t
-
g
ui: Optimize
e
ncoding name res
o
lution
u
sing a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Ga
v
rilov
git-gui:
Allow f
o
rcing
display en
c
oding for diffs using
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
g
i
t-gui:
Add a menu of available encodings
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilo
v
git-gui
:
Cleanup handl
i
n
g of th
e
default enc
o
d
ing
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pe
a
r
ce
gi
t
-gui:
Assume `blame --
i
ncrement
a
l
`
o
u
tpu
t
is in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn
O
.
Pear
c
e
git-gui: Use
g
itattribute "encoding
"
f
o
r file
conte
n
t
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Joshua Will
i
ams
git-gui: A
d
d support f
o
r
c
alling out to the prepare
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
P
e
arce
g
it-gui
:
Hide com
m
i
t
rel
a
t
ed UI during cit
o
ol
-
-nocommi
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Ga
v
rilov
git-gui: Add mo
r
e integrat
i
on opti
o
ns t
o
citool
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
B
r
andon
C
asey
git-stash
.
sh: do
n
't
d
ef
a
ul
t
t
o
ref
s
/stash if invalid
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
G
arry Do
l
ley
Fixed
som
e
gra
m
matical errors in git-rebase
.
txt docum
e
n
t
atio
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Deskin Miller
maint: c
h
e
c
k r
e
turn
of
split_cm
d
l
ine to avoid bad confi
g
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-13
Chr
i
stian Stimming
git-gui: Updated German translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-12
Christian Stim
m
ing
git-gui: I18n fix
sentence pa
r
ts into full
s
ent
e
nc
e
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
A
lexander Gavrilov
git
-
g
u
i: Restore ability to Stage W
o
rking
C
opy fo
r
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Ale
x
a
n
der Gavril
o
v
git-gui: F
i
x
B
l
ame Paren
t
& Cont
e
xt
for working copy
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pea
r
ce
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-09-05
S
haw
n
O
.
Pea
r
ce
g
it-gui: Fix diff
p
arsing for lines
start
i
n
g
with
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
l
e
x
ander Gavr
i
lov
git-g
u
i: Show special diffs fo
r
complex conf
l
ict c
a
ses
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui: Ma
k
e F5 reselect a diff
,
if an untr
a
cked file
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nder Gavrilo
v
git-gui: Reimplement and enhance au
t
o-selection of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
le
x
ander Ga
v
ril
o
v
git-gui: Support conflic
t
states
_U & UT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui:
S
uppo
r
t
mo
r
e
merge tools
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Al
e
xander Gavrilov
git-gui: Do
n
't al
l
ow staging files wi
t
h
c
o
nflic
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
g
i
t-gui:
S
u
p
port
c
a
l
ling merge tools
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander G
a
vrilov
g
it-gui: Support resol
v
ing conflicts via the diff context
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Christi
a
n S
t
i
m
ming
git-gui: Mar
k
forgot
t
e
n strings for
translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
Shawn O
.
Pearce
M
e
r
g
e bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2008-09-01
Alexander Ga
v
rilo
v
git-gui:
F
i
x
st
r
ing escaping in po2msg
.
sh
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
Clemen
s
Buchacher
git gui:
show
d
iffs
w
i
th a minimum of 1 context
l
ine
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
A
lexander G
a
vrilov
git-gu
i
: Allow spec
i
f
y
ing an in
i
t
ial
l
i
ne for git gui
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Alexand
e
r
Gav
r
ilov
git-gui: Better p
o
s
i
tioning in Blame
P
a
rent Commit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next