repo.or.cz
/
git
/
gitweb.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
Schindelin
mer
g
e-recursiv
e
: mark re
n
a
m
e/delete co
n
flict as u
n
merged
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
Junio
C
Hamano
M
erge branch 'js/rebase-i-p'
commit
|
commitdiff
|
tree
2008-12-24
J
o
ha
n
nes Schi
n
deli
n
rebase -i -p: leave a -
-
c
c patch wh
e
n a merg
e
could
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t9129: s
k
i
p the l
a
st three tests if UTF-8 locale
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Juni
o
C Hamano
GIT 1
.
6
.
1
-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Richard Hartma
n
n
Alwa
y
s
sho
w
which
di
r
ecto
r
y
is no
t
a git repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
R
ic
h
ard H
a
rtmann
Make
h
e
l
p entr
i
es alphabetica
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio
C
Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-22
Boyd Steph
e
n Smith Jr
git-revert docu
m
entation: ref
e
r to new
H
O
W
TO on rev
e
rting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
R
o
bin Rosenberg
git-rev
e
rt: record the parent a
g
ainst
which a re
v
e
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Ha
m
ano
Merg
e
git://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-21
Markus
H
e
i
delberg
doc/g
i
t-fsck: change the way for gett
i
ng
he
a
ds' SHA1s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Markus
H
ei
d
e
lberg
Documentatio
n
/git-show-
b
r
a
nch: w
o
rk
around "s
i
ngle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Jun
i
o
C Hamano
send-ema
i
l: futu
r
epro
o
f split_addrs() s
u
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Hamano
M
a
k
e
sure lockfiles
a
re u
n
l
ocked whe
n
dying o
n
S
I
GP
I
P
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René Scharfe
fa
s
t-impo
r
t
.
c: stricter strtoul check, silence compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
R
ené
S
charfe
connect
.
c:
stric
t
er po
r
t validati
o
n,
s
ilence
compil
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
N
anako Sh
i
r
a
i
shi
Add
a
do
c
umentat
on
h
ow to rev
e
rt a faul
t
y
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
K
irill A
.
K
or
i
ns
k
iy
R
e
m
o
ve the r
e
quireme
n
t opa
q
uelocktoken uri
scheme
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Marcel M
.
Cary
git-s
h
-
setu
p
:
Fix
s
cripts whose PWD i
s
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
afte
r
a merge could no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
J
ohannes Sixt
Sho
w
a
failure of re
b
ase -p
i
f the merge had a conflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Ma
r
kus Heidelberg
D
ocum
e
n
t
ation: fix
t
ypos, gram
m
ar, asciido
c
synta
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
Merge
branc
h
'maint'
t
o sync
w
i
th G
I
T
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 Hamano
f
a
st-import: make tagger information op
t
ional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Johannes Schindeli
n
fast-export
:
deal with tag obj
e
cts th
a
t do not have
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPatches:
me
n
t
ion the usage of real n
a
me in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-
m
ergetool: proper
l
y h
a
n
dle
"git mergetoo
l
-- filename"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
W
u
Fengguang
git-send-e
m
ail: handle e
m
ail address
w
ith
q
uoted comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
M
arkus Hei
d
elb
e
rg
Documentation: fi
x
typos, gr
a
mmar, asci
i
doc synt
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus Hei
d
elberg
Documentation:
sync
exampl
e
ou
t
p
u
t w
i
th git output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
R
en
é
Schar
f
e
F
i
x ty
p
e-mi
s
m
at
c
h compiler
warning from diff_popul
a
te_filespec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Michae
l
J Gruber
test
o
v
erlap
p
ing
i
gnore pa
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Juni
o
C
H
aman
o
Mer
g
e branch 'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarho
v
en
Enable thr
e
aded delta search
on Mac OS X/Darwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Na
n
ako Shir
a
ishi
Clarify docu
m
entation
of
"
git checko
u
t <
t
r
ee-is
h
>
p
aths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio
C Ha
m
ano
M
erge git://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os Vajna
g
i
t
hoo
k
s document
a
t
ion: add a not
e
ab
o
ut the
+
x
m
ode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Hama
n
o
combine-diff
.
c
: use strbuf_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Hamano
builtin-b
l
ame
.
c: use strbuf
_
readlin
k
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Hamano
make_absolute_pat
h
():
c
heck bounds when s
e
ei
n
g
an
overlong
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus
Torvalds
Make 'pr
e
p
are_te
m
p_
f
ile()' ign
o
re st_siz
e
for symlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us Torvalds
Make 'diff_populate_file
s
pec()'
u
se the
n
ew
'
s
t
r
b
u
f
_readl
i
nk()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus T
o
rvalds
Make '
i
ndex_path()' use
'
s
trb
u
f_r
e
adli
n
k()
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus To
r
vald
s
M
a
ke 'ce_compare
_
link()' use the
new
'strbuf_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus
T
orv
a
lds
Add generi
c
'
s
trbuf_readlink()' help
e
r functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ma
r
k
u
s H
e
id
e
l
b
e
rg
doc/git-reset
:
add re
f
e
r
ence to git-stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Mar
k
us Heidelberg
Documentat
i
on: f
i
x description for en
a
bling
hook
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s Vaj
n
a
git-da
e
mon documentation:
use {tilde}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hama
n
o
gitw
e
b:
do n
o
t run "git diff" that is
P
orcelai
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
G
I
T 1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
ano
G
IT 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
gitweb: do not run "git
d
iff" th
a
t is Porcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash completio
n
: Sync co
n
f
ig varia
b
les wit
h
the
i
r
man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
L
ee Ma
r
low
b
a
sh
comple
t
ion: Sort config complet
i
on vari
a
ble
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schind
e
lin
fast-im
p
ort:
c
lose
p
a
c
k before unlinking it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Haman
o
pager: do not dup2
s
tderr if it is
a
lre
a
dy re
d
irect
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
git-show:
d
o not se
g
f
ault w
h
en
s
howing a bad tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schind
e
lin
Get r
i
d
of th
e
last remnant
s
o
f
GIT_CONFIG_LOCA
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Alexander
Gavrilov
Documenta
t
io
n
: Describe git-gui T
o
ols me
n
u co
n
f
iguration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomokazu
git-f
a
st-import possible memory corr
u
ption proble
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Markus Heidelberg
bui
l
tin-comm
i
t: remove unus
e
d
mes
s
age variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Ju
n
io C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brandon
C
asey
g
it-branch:
d
isplay sh
a
1 on
b
r
anch d
e
leti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
gi
t
-config
.
txt:
f
ix
a t
y
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jun
i
o C Hama
n
o
Merge b
r
anch
'
m
a
int'
commit
|
commitdiff
|
tree
2008-12-11
L
i
nus Torvalds
fsck:
r
educe stack fo
o
tp
r
int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
reb
a
s
e: improve error
m
essag
e
s abo
u
t dirty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
N
icolas P
i
tre
make
s
ure packs to be repla
c
ed are
clo
s
ed beforeh
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potashev
F
i
x
ty
p
o in comment in buil
t
in-add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Fix
t
4031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
u
nio C Ha
m
ano
Mer
g
e
bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff
:
re
s
pect text
c
onv in rewrite
d
iffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jef
f
K
i
ng
diff: fix handling of binary rewrite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexa
n
der Po
t
ashev
Fix typos in document
a
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid
Lun
d
git-p4: Fi
x
r
e
gression
i
n
p4Where method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhu
e
s
I
m
prove language in git-merge
.
txt
and related docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C H
a
mano
work around Python
warnings
f
rom 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 Borzenkov
D
ef
i
ne linkgit macro
in [macro
s
] secti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Miller
git-s
v
n
:
Mak
e
following parents
a
tomi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jakub N
a
re
b
ski
git
w
eb: Fix
b
u
g
in insert_file() subro
u
ti
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
eff King
diff: allow turnin
g
on
t
extconv explicitly for plumbin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Je
f
f
K
i
ng
r
e
o
r
de
r
AL
L
O
W
_TEXTCONV o
p
tion setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C Hamano
read-cache
.
c: typo
f
ix in comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
u
nio
C
Hamano
builtin-checkout
.
c:
c
heck error return
from
r
e
a
d
_cac
h
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hama
n
o
Point
"stale"
1
.
6
.
0
.
5 documentat
i
o
n
from
the main git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
amano
Rever
t
"git-s
t
ash: use git re
v
-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
J
unio C H
a
mano
Update draft r
e
l
e
a
se
n
ot
e
s f
o
r 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio
C Haman
o
M
erge
branch
'maint'
commit
|
commitdiff
|
tree
2008-12-07
J
u
n
io C Hamano
GIT 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Matt
McCutc
h
en
"
git d
i
ff <tree>{3,}": do n
o
t reverse or
d
er of arguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff
King
t
ag:
d
e
lete TAG_ED
I
TMSG only
on succe
s
sful tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Narebski
gitweb: Make pr
o
j
ect spec
i
fic ov
e
rri
d
e
for 'g
r
ep' fe
a
tu
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
M
i
klos Vajna
h
ttp
.
c: use 'g
i
t_config
_
stri
n
g' t
o
get '
c
url_http_proxy'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
fetch-pack: Avo
i
d
memcpy(
)
with src==dst
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C
Hamano
Update draft
r
eleas
e
not
e
s to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next