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
Merge branch 'maint'
2008-12-29
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-29
Junio C Hamano
Prepare for v1
.
6
.
1
.
1 mai
n
tena
n
ce
r
elease
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-29
j
idanni@jidan
n
i
.
org
Documentation/dif
f
-o
p
tion
s
.
txt: unify o
p
tion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-29
Teemu
Likonen
F
i
x
the building
o
f gitman
.
in
f
o document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-29
Teemu Likonen
Fix
t
he building of
user-
m
a
nual
.
texi
a
nd gitman
.
t
exi
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-28
D
e
v
in D
o
u
cette
gitw
e
b
: Fix expor
t
check in git_ge
t
_
projects_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Juni
o
C Ha
m
ano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-27
J
unio
C
Hamano
Start 1
.
6
.
2
c
ycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Junio C Hamano
M
e
r
ge bra
n
ch 'rs/
m
aint-tformat-foldline' into maint
commit
|
commitdiff
|
tree
2008-12-27
Junio C Hamano
Me
r
ge branch '
r
s
/
maint-retval-fix'
i
nto
maint
commit
|
commitdiff
|
tree
2008-12-27
Junio C
H
amano
Mer
g
e branch
'
sp/maint-describe-al
l
-tag-warning' into
.
.
.
commit
|
commitdiff
|
tree
2008-12-27
Adeo
d
ato Sim
ó
git
-
send-email
.
txt: mov
e
--for
m
at-patch paragraph to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Adeodato Si
m
ó
git-shortlog
.
t
x
t
: impr
o
v
e documentation
a
bout
.
mailmap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René
S
charfe
prett
y
:
support multiline
subjects wi
t
h format
:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René Sch
a
r
fe
pretty:
f
actor
o
ut fo
r
m
a
t_subje
c
t()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Re
n
é Scharfe
pretty: factor out skip_
e
mpty_lines()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René
Scharfe
m
erge
-
fi
l
e: hand
l
e
freopen() failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
daemo
n
: cleanup: factor o
u
t x
s
t
r
du
p
_tolower()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Re
n
é Scharfe
daemon: c
l
eanup: replac
e
l
o
op with if
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René Sch
a
r
f
e
daemon: handle freo
p
en() failu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
S
hawn O
.
Pe
a
rce
de
s
cribe: Avoid unnecessary warn
i
ng w
h
en u
s
ing --all
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-25
J
u
nio C Hamano
GIT 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-24
J
unio
C
Hama
n
o
Merge
b
ranch
'
js/rebase-i-p'
commit
|
commitdiff
|
tree
2008-12-24
Jo
h
an
n
e
s Sc
h
indel
i
n
reba
s
e
-i -
p
: leave
a
--cc patch when a
m
er
g
e
c
ould
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t9129: s
k
ip
the last three tests if
UTF-8 loca
l
e is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio C
Haman
o
GIT 1
.
6
.
1-
r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Richard
H
artmann
Always show whic
h
dir
e
ctory is
n
ot a git repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
R
i
c
hard
H
art
m
an
n
Make help entries
alpha
b
etical
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-22
Boyd
S
te
p
h
en Smith Jr
g
i
t-revert docu
m
entation:
r
ef
e
r t
o
new
H
OW
T
O on reverting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
R
o
bin Rosen
b
erg
git-r
e
vert: rec
o
r
d the pa
r
ent aga
i
nst
w
h
ic
h
a revert
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
J
u
n
io C Hamano
Me
r
g
e
git:
/
/git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-21
Markus H
e
idelberg
doc/git-fsck: change the
way for getting
h
eads'
SH
A
1
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Markus Heid
e
lberg
Documentation/git-sh
o
w-branc
h
:
w
ork a
r
o
un
d
"singl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Hamano
sen
d
-email:
futureproof spli
t
_addrs() s
u
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Junio C
H
amano
Make sure lockfiles are unlocked when dying on SIGPIP
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René Scharfe
fast-import
.
c: st
r
icter str
t
oul check, silence compile
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René
S
charfe
con
n
ec
t
.
c: str
i
ct
e
r port vali
d
a
t
ion, silence compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Nanako Sh
i
raish
i
Add
a
docum
e
ntat on ho
w
to revert a
f
a
u
l
ty merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Kirill A
.
Korinskiy
Remo
v
e the requirement
opaquelo
c
ktok
e
n
uri scheme
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Marcel
M
.
Cary
git-sh-set
u
p: Fix scripts whos
e
P
W
D
i
s a
s
ym
l
ink into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
J
ohannes Sixt
rebase -i -p: Fix --c
o
n
tinu
e
aft
e
r a merge co
u
ld not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johann
e
s
Sixt
Sh
o
w a failu
r
e of
re
b
ase -p
if the merge had a conf
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus He
i
delberg
D
o
cume
n
tation: fix t
y
pos, gram
m
ar, asc
i
idoc
s
yntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Haman
o
Merge branc
h
'maint' to
s
ync
w
ith GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio
C
Hamano
GIT
1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Haman
o
fast-
i
mport: make tagger inf
o
rma
t
ion optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Joh
a
nn
e
s
S
chind
e
lin
fast-ex
p
o
r
t: de
a
l
with
t
ag ob
j
ects
t
hat
do not h
a
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vaj
n
a
SubmittingPatches:
mention the usage of real name in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: prope
r
ly handle
"
git me
r
geto
o
l -- filena
m
e"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Wu F
e
ngguan
g
git-send-email: hand
l
e email addres
s
w
i
t
h q
u
o
ted comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Mar
k
u
s Heidelberg
Documen
t
ation: fix typos, grammar, asciidoc synt
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus
Heidel
b
erg
Docu
m
entation: sync
e
xample ou
t
put w
i
th git output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
René Sc
h
arfe
F
ix ty
p
e-mismatch
c
ompil
e
r warning from
di
f
f_populate_filespec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Michael J
Grub
e
r
test overlapping ignore patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Haman
o
Merge
branch 'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Arj
e
n
Laarhoven
Enable threaded delta se
a
r
ch on Mac OS
X/Darwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shiraishi
Clarify d
o
cumentatio
n
of "git checkout <tree-is
h
> paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Ham
a
n
o
Merg
e
git://r
e
po
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos
V
ajna
githooks d
o
cumentation: add a not
e
abo
u
t the +x mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C
Hamano
co
m
bine-dif
f
.
c: use strbu
f
_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
b
u
ilt
i
n-blam
e
.
c: use strbuf_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
H
a
m
a
no
m
ake_abso
l
ut
e
_path(): check
b
ounds wh
e
n s
e
eing an overlong
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'prepare_temp_
f
ile()'
ignore
s
t_size for symli
n
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Tor
v
alds
Make 'diff_po
p
ulate_filesp
e
c()' use the ne
w
'strbuf_readli
n
k()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torv
a
ld
s
M
a
ke 'inde
x
_path()'
u
se 'str
b
u
f
_r
e
adlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
M
a
k
e 'c
e
_com
p
are_
l
i
n
k()' use the new
'strbuf_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Add gene
r
ic
'st
r
b
uf
_
readlink()'
helper
fun
c
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelberg
doc/git-reset: add referen
c
e
to
g
i
t
-
stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelberg
Do
c
umenta
t
ion: fix descr
i
pti
o
n for
e
n
a
bl
i
ng hooks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os Vajna
g
it-daemon do
c
umentation:
u
s
e {til
d
e
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C H
a
mano
gitw
e
b:
d
o not run "git d
i
ff
"
tha
t
is Porcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C
Ham
a
no
G
IT 1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
n
io C H
a
mano
GIT 1
.
5
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio
C Ha
m
ano
GIT 1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
gitweb: do not
run "git diff" that is
P
orcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee
Marlow
bash complet
i
on
:
Sync config variables with their man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee Ma
r
l
o
w
bash co
m
plet
i
o
n: Sor
t
config
c
o
mpletion variable
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
J
u
nio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-16
Joha
n
nes Schindeli
n
fast-import: close pa
c
k before
unlinki
n
g it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
pa
g
er: do not
d
up2 stderr if it is already redire
c
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
g
it-show: do not segfault when sho
w
ing a
b
a
d tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schindelin
Get rid of the
l
ast remnants of GIT_
C
ONFIG_
L
OCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
A
lexan
d
er G
a
v
r
ilov
Documentatio
n
: Describe gi
t
-gui
T
ools m
e
n
u c
o
nfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomoka
z
u
git
-
fast-
i
mport
possible
m
emory corrup
t
ion problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Markus Heide
l
berg
builtin-
c
ommit: remov
e
u
n
used message variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Ju
n
i
o
C
Hamano
Merge br
a
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-13
Brandon Casey
git-br
a
nch: di
s
play sha1 o
n
branch deleti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyerin
g
git-co
n
fig
.
t
x
t: fix
a
typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jun
i
o C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-11
L
i
nus Tor
v
alds
fsck: reduce stack footprint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff K
i
ng
r
ebase: impro
v
e error mess
a
ges about dirty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nico
l
a
s
P
itre
ma
k
e
s
ure pa
c
ks to be re
p
lac
e
d are
c
l
ose
d
before
h
a
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potashev
Fix typo in
c
ommen
t
in built
i
n-
a
dd
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
F
i
x
t403
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
un
i
o C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff Kin
g
diff: respec
t
textconv in
rewr
i
t
e
diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
eff Kin
g
diff: f
i
x hand
l
ing
o
f binary rewrit
e
diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander
P
otashev
F
ix typos in documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor
A
rvid Lund
g
it-p4: Fi
x
r
e
g
ression in p4Where
m
etho
d
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next