repo.or.cz
/
git
/
jnareb-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-12-27
Junio C
H
amano
M
e
rge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-12-27
Junio C Hamano
S
tar
t
1
.
6
.
2 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Junio C Hamano
Me
r
ge
br
a
n
ch 'rs/maint-tform
a
t-
f
oldli
n
e' into maint
commit
|
commitdiff
|
tree
2008-12-27
Junio C Ham
a
no
M
erge branch 'rs/ma
i
nt
-
r
e
tval-fix'
i
nto maint
commit
|
commitdiff
|
tree
2008-12-27
J
unio C H
a
mano
Merge br
a
nch '
s
p/maint-
d
escri
b
e
-all-tag-warning' into
.
.
.
commit
|
commitdiff
|
tree
2008-12-27
Adeoda
t
o Si
m
ó
gi
t
-send
-
em
a
il
.
txt: mo
v
e
--fo
r
mat-
p
a
t
ch par
a
graph
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Adeodat
o
Simó
git
-
s
h
o
r
tlog
.
txt: improve documentation ab
o
u
t
.
mailmap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
pre
t
ty: support multil
i
ne subjects with format:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Ren
é
Scharfe
pretty: factor out f
o
rmat_subject()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Re
n
é S
c
harfe
pret
t
y:
factor
o
u
t s
k
i
p
_empt
y
_lines(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
me
r
ge-file: handle freopen() fa
i
lure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René S
c
harfe
d
a
em
o
n: c
l
eanup: fac
t
o
r
out
x
s
trdup_to
l
ower(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Ren
é
Scharfe
daemon: cle
a
n
up: replace
loop w
i
th i
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
daemon: handle freo
p
en() failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Shawn O
.
Pearce
d
e
s
cribe: Avoid unnecessary warning when using --
a
l
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-25
Junio C Ha
m
ano
G
I
T 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-24
J
un
i
o C
H
a
m
ano
M
erge
b
ranch 'js/reb
a
se-i-p'
commit
|
commitdiff
|
tree
2008-12-24
Joh
a
nne
s
Sc
h
indelin
rebas
e
-i -p: leave a --cc patch
w
hen a merge could
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t
9
129:
skip th
e
last t
h
ree tests if UTF-8 locale is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
J
u
nio C Hamano
GIT 1
.
6
.
1-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Ri
c
hard Hartmann
Always show which direct
o
ry is not a gi
t
repo
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Richa
r
d Ha
r
t
m
a
n
n
Make help e
n
tries alphabe
t
ical
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-22
Boyd Stephen Smith Jr
git-r
e
ver
t
documentation: refer to ne
w
HOWTO o
n
rev
e
rting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Robin R
o
senberg
git-r
e
vert
:
r
eco
r
d t
h
e parent aga
i
ns
t
which a revert
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
J
u
nio
C
Hamano
Merge git://git
.
kern
e
l
.
org/pu
b
/scm/
g
itk/gi
t
k
commit
|
commitdiff
|
tree
2008-12-21
Mark
u
s Hei
d
elberg
doc/git-f
s
ck: change the wa
y
f
or getting he
a
ds' SHA1s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Mar
k
u
s
H
eidelberg
D
o
cumenta
t
ion/git-show-b
r
a
n
c
h: work a
r
ound "sin
g
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Ham
a
no
send-em
a
i
l: futureproof split_addrs() sub
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Ju
n
io C Hamano
Make sure l
o
ckfiles are un
l
ocked when dying
on S
I
GPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René Sch
a
rfe
fast-import
.
c: s
t
ricter s
t
rtou
l
c
heck, sil
e
nc
e
c
ompil
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René Scharfe
co
n
n
e
ct
.
c: stric
t
er
p
o
rt va
l
ida
t
ion, si
l
ence compil
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Nanako Shiraishi
Add a documentat
o
n how to revert a faulty merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
K
i
ri
l
l A
.
Korinskiy
Remove the
requirement opaq
u
e
l
ocktoken
uri s
c
heme
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Mar
c
e
l
M
.
C
a
r
y
git-sh-setup:
F
ix scripts w
h
ose PWD
is a sym
l
ink
into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johan
n
es Sixt
re
b
ase -i -p:
F
ix --contin
u
e aft
e
r a merge could not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
Show a f
a
ilure of rebase -p if the merge had
a co
n
f
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Document
a
tion: fix typos, gra
m
m
ar, asciidoc syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
unio C Ha
m
ano
M
erge bra
n
ch 'maint' to
sync with
G
IT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
unio C H
a
ma
n
o
GI
T
1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
u
nio C Hamano
fast-import: make tagger informat
i
on o
p
tio
n
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Johannes Schindel
i
n
fas
t
-
e
x
port: deal wi
t
h ta
g
o
bjects th
a
t do not
h
ave
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Mikl
o
s Vajna
Sub
m
ittingPat
c
hes: mention the usage of
rea
l
n
am
e
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
D
avid Aguilar
git-me
r
getoo
l
: pro
p
erly handle "
g
it mergetool -- file
n
ame"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
W
u
Fengguang
git-send-email: hand
l
e
e
m
a
il a
d
dress w
i
th quoted
comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus
Hei
d
elberg
D
o
cumentatio
n
:
fix typos, grammar, asciidoc syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heidel
b
erg
Documentation: sync exa
m
ple output wi
t
h git output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Re
n
é Schar
f
e
Fix t
y
pe-m
i
smatch
compi
l
e
r wa
r
n
ing from diff_populate_f
i
lespec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gruber
test overlapp
i
ng ignore
patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Ha
m
a
no
Merge branch 'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Ar
j
en Laarhoven
E
n
a
ble thre
a
ded
d
elta sear
c
h
on Mac OS X/D
a
rwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
N
a
n
a
ko Shirais
h
i
Cl
a
r
i
fy doc
u
mentation of "git checkou
t
<t
r
ee-ish> paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hama
n
o
M
erge git://repo
.
o
r
.
cz
/
g
it-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks documentation:
add a note
about the +x mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
com
b
ine-
d
iff
.
c: use
s
trbuf_readl
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
builtin-
b
la
m
e
.
c: use strb
u
f_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C
H
amano
make_absolute_pa
t
h():
che
c
k
bounds when
seein
g
a
n overlong
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Lin
u
s Torva
l
ds
Make 'pre
p
are_temp_
f
ile
(
)' ignor
e
st_
s
ize for symlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus T
o
rvalds
M
a
ke 'diff_populate_filespec()' use the
n
e
w 'strbuf
_
readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us
T
orval
d
s
Make
'
index_path()' use 'strbuf_readlin
k
()
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us Torvalds
Make 'ce_compa
r
e_link()' use
the
n
ew
'
strbu
f
_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
i
n
us Tor
v
alds
Add generic 'strbuf_re
a
d
l
ink()' he
l
p
e
r functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Hei
d
e
l
berg
doc/git-r
e
s
e
t
: a
d
d
refere
n
ce to git-sta
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
M
arkus Heidel
b
e
rg
Documentation:
f
ix descriptio
n
for enabling
hoo
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
V
a
jna
g
i
t-daemon documen
t
ation: u
s
e
{tilde
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
ano
gitw
e
b
:
do
n
o
t
r
un "git
d
iff" th
a
t is Porc
e
la
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o
C Ham
a
n
o
GI
T
1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
io C Hamano
GIT 1
.
5
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
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 i
s
Porcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee Ma
r
low
bash
c
o
mpletion: Syn
c
c
o
nfig var
i
a
b
l
es w
i
th their man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee
M
a
r
low
bash completion: Sort config comple
t
io
n
variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Haman
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
fas
t
-im
p
ort:
close pack
b
efore unli
n
king it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Juni
o
C
H
amano
pager: do not dup2
st
d
err if it is already
r
edi
r
ected
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
git-show:
do
n
o
t
segfault wh
e
n showing a
ba
d
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Joha
n
nes S
c
hindeli
n
Get rid of the las
t
re
m
nants of GI
T
_CONFIG_LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
A
l
e
x
ander Gav
r
ilov
Docume
n
tation: Describ
e
git-gui To
o
ls menu
configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Y
ONETANI Tomokazu
git-fast-i
m
port possible me
m
ory
c
orrup
t
io
n
problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Markus Heidelbe
r
g
builtin-c
o
m
m
it: remove unus
e
d mess
a
ge v
a
riable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Juni
o
C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brandon
Casey
git-bra
n
ch: display sha1 on
b
r
a
n
ch d
e
l
e
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim M
e
yering
git-
c
onfig
.
txt: fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Ju
n
io
C
H
amano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus Torva
l
ds
fsck: reduce stack
f
ootprint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
r
eba
s
e:
i
mprove
error m
e
ssages
a
bout dirty
s
tate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
N
i
col
a
s Pitre
make sure p
a
cks
t
o b
e
replace
d
are cl
o
sed bef
o
rehand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexa
n
der P
o
tashev
Fix typo
i
n
c
omment in builtin-add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hama
n
o
F
i
x t4031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Haman
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Je
f
f K
i
ng
diff: respect textconv in rewrite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff:
fix
handling of binary r
e
w
rite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
A
l
exander Potashev
Fix typos
i
n
documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
T
o
r
Arvid L
u
nd
g
i
t-p4: Fix
r
egression
i
n p4Where
method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
Im
p
rove languag
e
in git-merge
.
tx
t
a
n
d related docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio
C Hama
n
o
wor
k
around
P
ython
w
arn
i
ngs from AsciiDoc
Signed-off-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Alexey Bo
r
z
e
n
k
ov
D
e
fine linkgit m
a
c
ro
i
n
[
mac
r
os] secti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
D
e
skin Mille
r
git-svn: M
a
k
e following parents atomic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jaku
b
Narebski
gitw
e
b: Fi
x
bug in insert
_
f
i
le() subroutine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: allow turnin
g
on textconv explicitly for pl
u
m
bi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next