repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: mark rename/delete conflict as unmerged
2008-12-25
Johannes
S
chindelin
merge-recursive: mark rename/dele
t
e con
f
l
i
c
t as u
n
merged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-25
Jun
i
o
C
Ha
m
ano
GI
T
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-24
Junio
C
Haman
o
Merge branc
h
'
js/rebas
e
-i-p'
commit
|
commitdiff
|
tree
2008-12-24
Johannes S
c
hin
d
elin
reba
s
e -i -p:
l
eave a --cc patch when a
m
erg
e
c
ould
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Mik
l
os Vajna
t9129: skip the l
a
st three tests if UTF-8 locale is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
J
unio C
H
amano
GIT
1
.
6
.
1-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Richard
H
artmann
Always show which d
i
rectory is not a g
i
t
repo
s
i
tory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Rich
a
rd Har
t
mann
Make help entries alphabetical
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 Stephen Sm
i
th Jr
git-revert
d
o
c
umentation: r
e
fer
t
o ne
w
HOWTO on reve
r
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Robi
n
R
o
s
enb
e
r
g
g
i
t-revert: record the par
e
n
t
a
g
a
i
n
st which a
revert
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio C H
a
m
a
n
o
Merge git://
g
i
t
.
kernel
.
o
rg/pu
b
/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2008-12-21
Markus Heidel
b
erg
doc/gi
t
-fsck: change the way
f
o
r get
t
ing head
s
' SHA1s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Markus Heid
e
lberg
Docu
m
en
t
at
i
on/gi
t
-s
h
ow-branch:
work around "si
n
gle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
J
u
nio C
Ham
a
no
send-ema
i
l
: futureproof split_addrs() sub
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Juni
o
C H
a
mano
Make
s
ure lo
c
kfiles are unlo
c
ked w
h
e
n
dying
on SIGP
I
PE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Ren
é
Scharfe
fast-
i
m
port
.
c: stricte
r
strtoul check, silence
c
ompiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René
Scharfe
c
onn
e
ct
.
c: stri
c
t
er p
o
rt validat
i
on, sil
e
n
c
e
compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Nanak
o
Shi
r
aishi
Add
a docu
m
entat on h
o
w
t
o revert a f
a
ulty m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
K
iril
l
A
.
Korins
k
iy
Remov
e
the requirement opaquelockto
k
en uri scheme
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
M
a
r
ce
l
M
.
Car
y
git-sh-setup: Fix scripts whose PWD is
a symlink into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
rebase -
i
-p: Fix --co
n
t
inue
a
f
t
e
r a merge co
u
l
d not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
Show a failure
o
f
rebase -
p
if th
e
merge had a conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus
H
eidel
b
e
rg
D
oc
u
men
t
ation: fix
t
ypos, g
r
amma
r
, asciid
o
c
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ha
m
ano
Merge branch 'maint'
t
o
sy
n
c with
GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Juni
o
C Ham
a
no
GIT
1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio
C
Hamano
fast-impo
r
t
: make tagger information optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Johannes Schindelin
fast-export: de
a
l wi
t
h
t
ag objects that do no
t
hav
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
los Vajna
Submi
t
tingP
a
tc
h
es: mentio
n
the usage of real name in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Aguil
a
r
g
i
t-mergetool:
p
r
o
perly h
a
ndle
"gi
t
mergetool --
filen
a
me"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
W
u Fengguang
gi
t
-send-email: ha
n
d
l
e email address with qu
o
ted
c
omma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
M
a
rkus Heidel
b
erg
Doc
u
mentation: fix
typo
s
, grammar, asciidoc syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus H
e
i
d
elberg
Documenta
t
ion: sync example outp
u
t with git outp
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
René Scharfe
F
ix t
y
pe-mismatch compiler w
a
rnin
g
f
r
o
m diff_
p
opulate_filespec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gr
u
ber
t
est overlapping ig
n
o
r
e patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Ha
m
ano
Merge
b
ranc
h
'lt
/
readlink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen
Laarhoven
Enable
t
hreaded
del
t
a se
a
rch on Mac OS X
/
Dar
w
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Nanako
Shirai
s
hi
C
l
arify documentatio
n
of "git checkout <tree-ish> paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C
Hamano
Merge git://repo
.
or
.
cz/
g
i
t-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos
Vajna
githooks documentat
i
on: add
a
note ab
o
ut
the +x mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Hamano
combine-d
i
ff
.
c
: use strbuf_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
b
u
iltin-
b
lame
.
c: u
s
e strb
u
f_
r
eadlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Haman
o
m
a
ke_
a
bs
o
lute_path(): check bound
s
when se
e
ing an overlo
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torv
a
lds
Mak
e
'
p
r
e
p
a
re_temp_file()
'
ig
n
o
re
st_si
z
e fo
r
symlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
inus Torvalds
Make 'd
i
ff
_
populate_filespec(
)
' use
t
h
e new 'st
r
buf_
r
e
a
dlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
M
ake 'inde
x
_path()' use
'strbuf_read
l
ink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
inus Tor
v
alds
Make 'ce_compa
r
e_l
i
nk
(
)
' use the
n
e
w 'strbuf_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvald
s
Add generic
'
strbu
f
_readlink()'
hel
p
er function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidel
b
e
r
g
doc/git-reset: add reference to git-stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelberg
D
ocumentat
i
on: fix description
f
or enabl
i
ng hooks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos Vajna
git-
d
aemon
d
ocu
m
entation:
use {tilde}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C
H
amano
g
i
tweb: do
n
ot
r
un "g
i
t
d
iff" that is Porcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
io C
H
ama
n
o
GI
T
1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Ha
m
an
o
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
J
unio C Hamano
gitwe
b
: do not run "git dif
f
" that is Po
r
celain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
L
ee Mar
l
ow
bash
c
o
m
pletion: Sync co
n
fi
g
vari
a
b
l
es with the
i
r man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
L
e
e Marlow
bash
c
o
m
p
leti
o
n
:
S
o
rt
config completion variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Me
r
g
e
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2008-12-16
Johanne
s
Schindeli
n
f
ast-import: c
l
ose pack before unlinking
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
J
u
nio C Hamano
pager: d
o
not
d
u
p2 stde
r
r
i
f it is already
red
i
r
ecte
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Jun
i
o
C
H
aman
o
git-show: do not se
g
fault when showing a
b
ad tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Jo
h
annes Schin
d
e
lin
Get r
i
d of
t
he last remnants of GIT_C
O
N
FIG_LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Alexander Ga
v
rilov
Documentation: Describe
git-
g
ui Tools men
u
c
onfigu
r
a
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tom
o
kazu
git
-
fast-impo
r
t pos
s
ible
m
emory corru
p
tion problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Markus Heidelb
e
r
g
bui
l
tin
-
commit: remove
un
u
sed message variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hamano
Merg
e
b
ranch
'
m
aint'
commit
|
commitdiff
|
tree
2008-12-13
Br
a
ndon Cas
e
y
g
i
t
-
b
ranc
h
: displa
y
sh
a
1 on bran
c
h dele
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim
M
eyering
git-c
o
nfig
.
tx
t
: fix a
typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Junio C
Ha
m
ano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Lin
u
s Torvalds
f
sck
:
reduce stack footprint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff
Kin
g
rebase:
i
mpro
v
e
e
rror messages about
d
irty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas Pitre
make sure pac
k
s
t
o be
r
epl
a
c
e
d are closed bef
o
reha
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander
P
otash
e
v
Fix typo
in c
o
m
ment in bu
i
ltin-add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
u
nio C
Hamano
Fix t403
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
u
n
io C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-12-10
Jeff
K
ing
diff:
r
e
spect
t
extconv in r
e
wr
i
te diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jef
f
King
diff: fix
h
and
l
in
g
of binary
r
e
w
rite
d
iffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alex
a
nder Potashev
Fix typ
o
s in docume
n
ta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor
A
rvid Lund
g
it-p4: Fix
r
egr
e
ssion in p4Where method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
I
m
prove lan
g
uage in git-merge
.
txt and relate
d
docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
work around Python war
n
ings fro
m
AsciiD
o
c
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
B
orzenkov
D
e
fine linkgi
t
m
acr
o
in [macros] section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Deski
n
M
iller
git-svn: Make followi
n
g parents atomic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
a
kub
N
arebski
gitw
e
b: Fix bug in i
n
sert_file()
s
ubroutine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff K
i
ng
d
i
ff: allow turning on text
c
onv exp
l
icitly
for p
l
umbing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Ki
n
g
reor
d
e
r
ALLOW_TEXTCONV o
p
tion set
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hama
n
o
rea
d
-c
a
che
.
c: typof
i
x
i
n co
m
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
Hamano
builtin
-
c
h
eck
o
ut
.
c: check error retur
n
from
read_cache()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Point "st
a
le" 1
.
6
.
0
.
5 documentation from the main git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
u
n
i
o
C
Hamano
R
e
vert "g
i
t-st
a
s
h
:
use g
i
t rev-parse
-q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
Upda
t
e
draft release notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
Merge branch
'
ma
i
n
t'
commit
|
commitdiff
|
tree
2008-12-07
Junio C Ha
m
ano
GIT 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Ma
t
t
McCutche
n
"git diff
<tree>{3,}
"
: do
n
ot reverse
o
rder of a
r
gume
n
ts
commit
|
commitdiff
|
tree
2008-12-07
J
e
ff King
tag: d
e
lete TAG_ED
I
TM
S
G only on succ
e
s
s
ful ta
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jaku
b
Narebski
gitweb
:
Make proj
e
ct specific overri
d
e
for 'grep' featur
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c
: use '
g
it_c
o
nf
i
g_strin
g
' to get 'curl_http_p
r
oxy'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Th
o
mas Rast
fetch-pa
c
k: Avoid memc
p
y
(
)
with src==dst
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C
Hamano
Update draft release notes t
o
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next