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 Schinde
l
i
n
mer
g
e-recur
s
i
v
e: mark rena
m
e
/
delete co
n
fl
i
c
t as unmerg
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
J
unio C Hamano
GIT 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-24
Junio C Ham
a
no
Merge branch 'js/rebas
e
-i-p'
commit
|
commitdiff
|
tree
2008-12-24
J
ohannes Schindelin
r
e
bas
e
-i -p: leave a --cc patch
w
hen a me
r
ge co
u
ld
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos
Vajna
t
9
129
:
s
kip the
l
ast t
h
ree t
e
sts if UTF-8
loc
a
le is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Juni
o
C
H
amano
GIT
1
.
6
.
1-r
c
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Richard Har
t
mann
Alwa
y
s
s
h
o
w whic
h
directory i
s
not a git repo
s
itory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Richa
r
d H
a
rtmann
Make
h
e
lp ent
r
ie
s
alphabetical
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Jun
i
o C Hamano
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-22
Bo
y
d
Stephen Smith Jr
git-rever
t
documentation: re
f
er to new HOWTO on
reverting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Robin Ros
e
n
b
erg
git-reve
r
t
:
r
e
cord th
e
parent against which a
r
evert
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
M
erge git:
/
/g
i
t
.
kernel
.
org/
p
ub/
s
cm/
g
i
t
k/gi
t
k
commit
|
commitdiff
|
tree
2008-12-21
Markus
H
e
i
d
elberg
doc/
g
i
t-fsck: c
h
ange
t
he
wa
y
f
o
r getting he
a
ds'
SHA1s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Markus He
i
delberg
D
o
cumentation/git-show-bra
n
c
h
:
w
ork around
"
si
n
g
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Ham
a
no
send-email: future
p
roof spli
t
_addrs() s
u
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Junio
C
Hamano
M
ake s
u
re lockfiles are unloc
k
ed w
h
en dying o
n
SI
G
PIPE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
René Scharfe
fast-im
p
or
t
.
c: stricter
s
trtoul check,
silence compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
René Schar
f
e
connect
.
c: stricter port valid
a
ti
o
n, sil
e
nce compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
N
a
nako Shir
a
i
s
h
i
Add a documentat on
h
ow to rever
t
a f
a
ulty m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Kirill A
.
Kor
i
nsk
i
y
Remove the
r
equirement opaquel
o
cktoken uri scheme
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Marcel M
.
C
ary
git-sh-setup:
F
ix scrip
t
s whose PWD is a symlink into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Six
t
rebase -i -p:
Fix
--continue after a mer
g
e co
u
l
d
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johanne
s
Sixt
Show a
f
ailure of rebase -p if the merge
h
a
d a confli
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heide
l
ber
g
D
o
cumentation
:
fix typos, gr
a
mmar, asciidoc sy
n
tax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Ju
n
io C Hamano
M
e
rg
e
branch 'maint' to
sync with GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Ju
n
i
o C Hama
n
o
G
I
T 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Jun
i
o C Hamano
fas
t
-import: make tagge
r
info
r
mation optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Joha
n
nes Sch
i
ndelin
fast-export: deal w
i
th tag ob
j
e
c
ts
t
hat
do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mikl
o
s Vajna
S
u
bmi
t
tingPatches: mention the usa
g
e of real
name i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
it
-
merget
o
ol: p
r
operly
h
andle "g
i
t
mergetool -- filename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguang
g
i
t-send-email: handle email
a
ddress wi
t
h
quoted comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus
Heide
l
berg
D
o
c
ume
n
tation: fi
x
typos, gram
m
ar, asciido
c
synta
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Ma
r
kus Heidelberg
Document
a
tion:
sync example out
p
ut
w
ith git output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René Scharfe
Fix type-mi
s
mat
c
h compiler wa
r
nin
g
from dif
f
_po
p
ula
t
e_filespec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Mich
a
e
l
J Gru
b
er
tes
t
overlapping ignore patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio
C
H
amano
Merge bra
n
c
h
'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
A
r
jen Laarhoven
Enable
t
hreaded
delta search
on Mac OS X/Darwi
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Na
n
a
ko Shiraishi
C
l
arif
y
documentation of "
g
i
t chec
k
o
ut <tree-ish> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
M
erge git://repo
.
or
.
c
z/git-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
Ha
m
ano
comb
i
ne-
d
iff
.
c
: u
s
e strbu
f
_r
e
adlin
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio
C Hamano
builtin-b
l
ame
.
c
:
u
s
e strbuf_
r
eadlink
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Ham
a
n
o
make_absolute_path(): check boun
d
s when seeing an ov
e
rl
o
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us
T
o
r
valds
Mak
e
'p
r
epare_temp_fi
l
e
(
)
'
ign
o
re st_size
for symlink
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Lin
u
s Torvalds
Mak
e
'd
i
ff_pop
u
late_filespe
c
()
'
use
t
he new 'strbuf_rea
d
link()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus Torvalds
Make 'index_path()' use 'strb
u
f_r
e
a
d
li
n
k()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torval
d
s
Make 'ce_compare_
l
ink()' use the new 'strbuf_
r
eadlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus T
o
rval
d
s
Add generic
'
strbu
f
_read
l
ink(
)
' helpe
r
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus Hei
d
elberg
doc/git
-
reset: add reference to g
i
t-s
t
ash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus
H
e
i
delber
g
Doc
u
menta
t
ion: fix descri
p
t
ion for en
a
bling ho
o
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajn
a
gi
t
-d
a
emo
n
do
c
umen
t
ation: use {
t
i
ld
e
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Hamano
gitweb:
d
o not run "git diff" that is Porcela
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C H
a
mano
GIT 1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Haman
o
GIT
1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C Hama
n
o
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 no
t
run "git
d
iff" that is
Porce
l
a
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marl
o
w
bash co
m
pletion: Sync config variables with t
h
eir m
a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee
Marlow
b
ash completion
:
Sort confi
g
completion variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-16
Jo
h
anne
s
Schi
n
del
i
n
fast-imp
o
rt:
c
lose p
a
ck before
u
n
linking
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
H
amano
pa
g
er:
d
o
not
dup
2
st
d
err
i
f it
is
a
lre
a
dy
r
edirected
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Ham
a
n
o
git-show: do not se
g
fault w
h
en sho
w
ing a bad
t
ag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johannes S
c
hindel
i
n
Get rid of t
h
e last
remnants of GIT_CO
N
FIG
_
LOCAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Ale
x
ander Gavri
l
o
v
Do
c
u
m
e
n
tation
:
Desc
r
ibe
git-g
u
i
To
o
ls
menu conf
i
guration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Y
ON
E
T
A
N
I
Tomokazu
gi
t
-fa
s
t-impor
t
p
o
ss
i
bl
e
memor
y
corruption problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
M
a
rk
u
s Heidelberg
b
u
iltin-comm
i
t
: remove unused
message variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio
C
Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-13
B
rand
o
n Casey
git-branc
h
: display sha1 on bra
n
c
h deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Ji
m
Meyering
g
it-config
.
t
xt:
f
ix a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jun
i
o C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus Torval
d
s
fsck: reduce stack fo
o
tprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
rebase: impr
o
v
e
error messages
about dirty
s
tate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nicola
s
Pi
t
re
m
a
ke s
u
re packs to
b
e replaced
a
re closed bef
o
rehan
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander
Potashev
F
i
x typo in
com
m
ent in bu
i
ltin-add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jun
i
o C H
a
mano
F
i
x
t
4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
unio C
H
amano
Merg
e
branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: respe
c
t textconv in rewrite di
f
fs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff Kin
g
d
i
ff: fix hand
l
ing
o
f
b
inary
r
e
w
rite diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander
Po
t
a
shev
Fix typos
i
n documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Tor
A
r
vid
L
und
git-p4:
F
ix regr
e
ssion
i
n
p4Where method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
R
alf Wildenhues
I
m
p
rove language in git-merge
.
txt and related
docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
un
i
o C
Hamano
work a
r
ound Python warnings from Ascii
D
oc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey Borzenkov
D
e
fine linkgit macro in [macros] section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Mill
e
r
gi
t
-svn:
M
ake follow
i
ng paren
t
s ato
m
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Nare
b
s
k
i
gitweb: Fix bug in
in
s
ert_
f
ile(
)
subrou
t
ine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff
K
ing
d
iff: allow turning on
t
e
xtconv
exp
l
icitly for plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
reorder AL
L
OW_TEXTCONV o
p
ti
o
n settin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Hamano
read-cache
.
c
:
t
ypofix in comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
Hamano
buil
t
i
n
-checkout
.
c
:
che
c
k error re
t
urn
from
r
e
a
d_cac
h
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C
Hama
n
o
Point "
s
tale" 1
.
6
.
0
.
5 documentation
f
rom the main git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
amano
R
e
v
e
rt "g
i
t
-st
a
s
h
: use gi
t
rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
Update
d
raft
release
notes
for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
J
u
nio C Hamano
GIT 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Matt McCutchen
"g
i
t
d
iff <tree>{3,}": do
n
ot reverse order of
arguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff
King
ta
g
: delete
TAG_EDITMSG onl
y
on
s
uccessful
t
a
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub
N
arebski
gi
t
web: Ma
k
e project specif
i
c overrid
e
f
o
r 'grep' featu
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Mik
l
o
s Vajna
h
t
tp
.
c:
u
se 'git
_
config_s
t
ring' to
g
et 'curl_htt
p
_p
r
o
xy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Tho
m
as Ras
t
fet
c
h-pack: Avoid memc
p
y()
with src==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Ju
n
io C Hamano
Up
d
ate draft release notes
to
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next