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
rebase -i -p: Fix --continue after a merge could not be redone
2008-12-21
Johannes Sixt
rebas
e
-i -p:
Fix --
c
ontinue after a merge
c
ould not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
Show a failure of
r
ebase
-
p if the merge had a con
f
lict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus
H
eide
l
berg
Do
c
ument
a
tion
:
fix typos
,
grammar, ascii
d
oc
syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
H
amano
Mer
g
e br
a
nch '
m
aint
'
to sync with
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
J
u
nio C
H
amano
fast-import:
m
ake
tag
g
e
r
in
f
ormation opti
o
nal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Johannes
Schindelin
fast-export: deal wit
h
tag objects tha
t
do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajn
a
Submitt
i
ngPatches
:
mentio
n
the usage of real n
a
m
e in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-merget
o
ol:
properly hand
l
e "git me
r
getool -- file
n
am
e
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
W
u Fenggu
a
ng
git-send-email: handle ema
i
l address
with quoted comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heide
l
b
e
r
g
Documentation:
fix typos, gramm
a
r, asciidoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Markus He
i
delberg
Documentation: sync ex
a
mp
l
e output wit
h
git
outp
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Ren
é
Scharfe
Fix t
y
pe
-
mismatch com
p
ile
r
warn
i
ng
from diff_po
p
ulate_filespec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Mi
c
hael J Gruber
t
e
s
t overlapping ignore patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Merge b
r
anch
'
lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
A
rjen Laa
r
h
o
v
e
n
Ena
b
le threaded
d
elta se
a
rch on Mac O
S
X/Da
r
win
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
N
anako Shiraishi
Clarify d
o
c
u
mentation of "git ch
e
ckout <tree-
i
sh
>
paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Haman
o
M
e
rg
e
g
i
t://r
e
po
.
or
.
cz
/
g
i
t-
g
u
i
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos
V
aj
n
a
githoo
k
s d
o
cument
a
tion: add a note abou
t
the +
x
mod
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
combine-d
i
ff
.
c
: us
e
st
r
buf_readlink
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
builtin-
b
lame
.
c: u
s
e
s
trbuf_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Hamano
make_absolute_
p
ath(): che
c
k bounds
w
h
en seeing an
o
ver
l
ong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torval
d
s
M
ake
'
prepare_temp_file()' ignore st_si
z
e for symlin
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus
Torvalds
Make 'dif
f
_populate_filespec()' use the new 'strbuf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'inde
x
_path()' use
'
strb
u
f
_readlink()
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus To
r
valds
Make 'ce_
c
ompare_link()' use the new
'str
b
uf_readli
n
k
(
)
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torval
d
s
Add generi
c
'strbuf_readlink()' he
l
per fun
c
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus He
i
delbe
r
g
doc/git-rese
t
: add referenc
e
to git-stash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Ma
r
kus Heidelberg
Documentatio
n
: fix d
e
scri
p
tion
f
or enab
l
ing
h
ooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon do
c
um
e
ntation: use {tilde}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
gitweb: do not run
"g
i
t diff" that is Porcelai
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio 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
Hama
n
o
G
I
T 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
u
nio
C H
a
mano
gitweb: do
n
ot
r
un
"
git d
i
ff
"
that
i
s Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Ma
r
low
bash completi
o
n: Sync config
v
a
riables
with their man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Le
e
M
arlow
bash
c
ompletion: Sort con
f
ig completi
o
n va
r
iables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Sch
i
n
d
elin
fast-import: close pack
b
efore unli
n
king it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
Ha
m
ano
pa
g
er: do not
dup2 stderr if
it is
a
lready redirected
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio
C
Hamano
git-show: do not s
e
gfault
when showing a bad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schi
n
d
e
l
in
Get
r
i
d
of the last
remnants
o
f GI
T
_CONFIG_L
O
CAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexander G
a
vrilov
Do
c
u
m
e
ntation: Describe git-gu
i
Tools m
e
nu configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tom
o
k
a
z
u
git-fast-import possible
memory corruption problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Markus
H
eidelbe
r
g
b
u
iltin-commi
t
: remove unus
e
d mes
s
age variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
B
r
andon Casey
gi
t
-branch:
d
i
splay sha1
on bran
c
h
d
eletio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meye
r
ing
g
it-config
.
txt:
f
i
x a
t
ypo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Junio C Hamano
Me
r
ge
b
ran
c
h 'maint
'
commit
|
commitdiff
|
tree
2008-12-11
Lin
u
s Torval
d
s
fsck: reduce stac
k
footpri
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff K
i
ng
r
e
b
ase: improve error
messages about dirt
y
state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
N
icolas P
i
t
r
e
mak
e
sure packs to be r
e
placed are
c
losed beforehand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potashev
Fix typo in co
m
ment in bu
i
ltin-add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Fix t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Merge
b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
di
f
f: r
e
spect tex
t
co
n
v
i
n
rewrit
e
diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff
K
i
ng
d
iff: fi
x
ha
n
dling of
bin
a
ry rewr
i
te dif
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alex
a
nder
Potashev
F
ix typos
in documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Tor
Ar
v
id
L
und
git
-
p4: Fix re
g
re
s
si
o
n
i
n
p
4W
h
ere m
e
thod
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf W
i
ldenhues
I
m
p
rove
lang
u
age in git-mer
g
e
.
txt
a
nd related
docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
u
n
io C Hamano
work ar
o
und P
y
thon warnings from AsciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey
Borzenkov
D
e
f
ine l
i
nkgit macro in [macr
o
s] section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Deskin
M
iller
git-sv
n
: Make following p
a
rents atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Nare
b
ski
g
i
twe
b
:
F
i
x
b
ug in insert_file() subroutine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: a
l
low
t
u
rning on text
c
onv expli
c
i
tly for plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
reorder ALL
O
W
_
TEXTC
O
NV op
t
i
o
n setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
Ha
m
ano
read-cache
.
c
:
typofix i
n
comm
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C
Hamano
builtin-check
o
ut
.
c: check er
r
or return f
r
om r
e
ad_cache()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
un
i
o C Hamano
Point
"
stal
e
" 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
Ju
n
io C Hamano
R
ev
e
r
t "git-stash: use
git rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C
Hamano
Update draft
r
elease notes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Haman
o
Merge b
r
anc
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
G
I
T
1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Matt McCutchen
"
git diff <tree>{3,}": do not rev
e
rs
e
order of arguments
commit
|
commitdiff
|
tree
2008-12-07
J
e
f
f King
tag: de
l
ete TAG_EDITMSG onl
y
on succ
e
ssful tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Narebs
k
i
gitweb: Make pr
o
j
ect
specific override for 'gre
p
' fea
t
ure
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Mik
l
os Vajna
http
.
c: use 'git_config_str
i
ng' to get
'curl_http_proxy
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
T
ho
m
as R
a
st
fetc
h
-p
a
ck:
A
void
mem
c
py(
)
with
s
rc==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C
H
a
mano
U
p
date draft rel
e
ase notes to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio
C
H
a
mano
M
erge branch 'jc/a
m
-option
s
'
commit
|
commitdiff
|
tree
2008-12-06
J
u
n
io C Hamano
g
i
t-a
m
: rename apply_opt_extra
fi
l
e to apply-op
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
u
nio C
Hamano
Test that gi
t
-am does no
t
l
o
se -C/-p/--whitespace option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Ha
m
ano
git
-
am: pro
p
a
gate --3way options as
well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Ha
m
ano
git
-
am: propagate -C<n>
,
-p
<
n> opti
o
ns as we
l
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
gi
t
-am --whitespa
c
e: do no
t
lose the comman
d
lin
e
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
To
r
A
rv
i
d Lund
git-p4:
Fix
b
u
g
in p
4
W
h
ere method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex
Riesen
R
eport symli
n
k
fai
l
ures in merge-recur
s
ive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Mak
e
chd
i
r failures vi
s
i
b
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make some
of fwrite/
f
close
/
write
/
c
lose failures visible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
Ju
n
io C Ha
m
ano
Merge
b
ranch 'd
m
/svn-remo
t
e'
commit
|
commitdiff
|
tree
2008-12-04
Junio
C
H
amano
Me
r
ge b
r
anch 'jn/gitwe
b
-
utf8'
commit
|
commitdiff
|
tree
2008-12-04
Jef
f
King
a
d
d stage to gitign
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
s
u
bmo
d
ule: u
s
e git rev-parse
-
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase: us
e
git rev-parse
-
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
p
ull: use g
i
t rev
-
parse
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
lost-found: use
git rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
filter-branch: use
git
r
ev-p
a
rse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Deskin
M
iller
git-svn: Make branch
use correct svn
-
remot
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge branch 'jc/
r
m-i-t-a'
commit
|
commitdiff
|
tree
2008-12-03
J
unio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next