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
rebase -i -p: Fix --continue after a merge could not be redone
2008-12-21
Johannes
S
i
x
t
re
b
ase
-
i
-
p: Fix -
-
con
t
inue after
a
me
r
ge could not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Joh
a
nn
e
s Sixt
S
how a failure of rebase -p if the m
e
rge had a
c
onflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Documen
t
ati
o
n: fix typos,
g
rammar, asc
i
idoc synta
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Ju
n
io C Hama
n
o
Merge
b
ranch 'maint' to
sync with GIT
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
Jun
i
o C Hamano
fast-import: make tagger infor
m
ation o
p
tional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
o
hannes Schindelin
fast-export: dea
l
with tag objects t
h
at
do
not h
a
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
S
u
b
mittingPatches: mention the usage of real nam
e
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
i
lar
git-
m
e
r
ge
t
ool:
p
roperly h
a
n
dl
e
"git merget
o
ol -- filename"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguang
git-send-
e
mail: handle
e
mail address with quo
t
e
d comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus
H
e
ide
l
b
er
g
Documentati
o
n: fi
x
typos, gra
m
mar, asciidoc syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus H
e
idelber
g
Doc
u
ment
a
tion: syn
c
e
x
a
m
ple output wit
h
git output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Re
n
é
S
charfe
Fix
t
ype-mismat
c
h compiler
w
a
r
ning
from diff_
p
opul
a
te_filespec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
M
ichael J Gruber
te
s
t overla
p
ping ignore patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
M
e
rge b
r
an
c
h 'lt/
r
eadlink'
commit
|
commitdiff
|
tree
2008-12-18
A
r
jen
L
aarhov
e
n
E
n
able threaded
d
el
t
a search on Mac OS X/Da
r
win
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shiraishi
Clarify documentation
of
"git checkout <tr
e
e
-
i
s
h> paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
J
unio C
Hamano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
M
iklo
s
Vajna
git
h
ooks documenta
t
ion:
a
dd a note about the
+
x mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Ham
a
no
combine-diff
.
c: use strbuf_r
e
adl
i
n
k
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio
C
Hamano
builtin
-
b
lame
.
c
: use s
t
r
buf_
r
e
a
dlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Hamano
m
ake
_
absol
u
te_p
a
th(
)
:
check bounds whe
n
seeing an overlo
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus
Torvalds
Make 'pre
p
are_temp_file()
'
ignore st_size for symlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus
T
o
r
v
al
d
s
M
ake
'
diff_popula
t
e_filespec()' use
the ne
w
'
st
r
buf_rea
d
l
i
n
k
()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make '
i
n
dex_path
(
)' use 'str
b
u
f
_rea
d
link()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
inus To
r
valds
Ma
k
e 'ce_comp
a
re_link()' use the new 'strbuf_readl
i
nk()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us Torva
l
ds
Add generi
c
'strbu
f
_
r
ea
d
link()' helper
f
unction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ma
r
kus Heide
l
berg
d
o
c/
g
it
-
re
s
e
t
: add
referen
c
e to git-stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelberg
Documentation
:
fix description
for e
n
abl
i
n
g hooks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Miklos V
a
jna
git-daemon docu
m
e
n
tation: use {t
i
lde
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
ano
gitweb: do not run "g
i
t
diff" that is Porcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
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 Hamano
G
IT
1
.
5
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Hamano
G
I
T 1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Ham
a
no
gitwe
b
:
d
o not r
u
n "git diff" that
is Porcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
L
ee Marl
o
w
bash completion: Sync config variab
l
es
w
ith
their man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
L
e
e
Mar
l
o
w
ba
s
h
completio
n
: So
r
t co
n
fig completion
v
aria
b
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C
H
aman
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-16
Joh
a
nnes Schindelin
fa
s
t-
i
mport
:
close pack befor
e
unli
n
king
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
Hamano
page
r
: do not
dup2 stde
r
r
i
f
it is already redirected
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Ham
a
no
git-show: do not segfault when showi
n
g
a
bad ta
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schindeli
n
Get rid of the la
s
t remnants of GIT_CONFIG_LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Alexa
n
de
r
Gavrilo
v
D
ocume
n
ta
t
ion: Descr
i
be git-g
u
i Tools menu configura
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomokazu
git-fast-import possible memory corr
u
ption pr
o
blem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
M
ark
u
s
Heidel
b
erg
b
u
ilti
n
-comm
i
t:
remov
e
unused
message variabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brand
o
n
Cas
e
y
git-br
a
nch: display sha1 on branch de
l
e
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
J
im Meyering
gi
t
-
conf
i
g
.
txt: f
i
x a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Junio C
Hamano
Me
r
ge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus To
r
vald
s
fs
c
k:
re
d
uce sta
c
k
f
ootprint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff K
i
ng
rebas
e
: improve error message
s
ab
o
u
t
dirty sta
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Ni
c
olas Pitre
make sure packs
to be
replac
e
d
are clos
e
d bef
o
rehand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
A
l
exander Potash
e
v
F
i
x typo in comment
i
n builtin-
a
dd
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Fix t403
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: respect textconv i
n
rewrite d
i
ffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
eff Ki
n
g
d
iff: fix handling of bin
a
ry rewrite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potashev
Fix
typos in docume
n
tat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
T
o
r Arvid
Lund
git-p4: Fix regression
i
n
p4Where met
h
o
d
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
R
a
lf Wild
e
nhues
I
mprove la
n
guage in git-
m
erge
.
txt and relat
e
d doc
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
u
n
i
o C Hama
n
o
work around Python w
a
rnings from
A
sc
i
iDoc
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
zenk
o
v
Define linkg
i
t macro in
[
macro
s
] sect
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
De
s
kin Mil
l
e
r
git-svn: Make
f
ollowing parents atomic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Nareb
s
ki
gitw
e
b: Fi
x
bu
g
in
i
n
s
er
t
_
file(
)
subro
u
tine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff
:
al
l
ow tur
n
ing on textc
o
nv explicitly for plumbi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
eff Ki
n
g
reorder ALLOW_TEXTCO
N
V o
p
tion setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
un
i
o
C
H
a
mano
re
a
d-
c
a
c
h
e
.
c
:
typofix in comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jun
i
o C
Hamano
built
i
n-checkou
t
.
c: check error
r
e
turn from rea
d
_cache(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
un
i
o C Hamano
Point "stale"
1
.
6
.
0
.
5 documentati
o
n from the main g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Revert "git-s
t
ash: use git rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Ju
n
io C Ham
a
n
o
Update
d
raft relea
s
e
note
s
f
or 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio C
Hamano
Mer
g
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-07
Junio C Ham
a
no
G
I
T 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Matt
M
cCutch
e
n
"git diff <tree>{
3
,}": do
n
ot revers
e
or
d
er of ar
g
ument
s
commit
|
commitdiff
|
tree
2008-12-07
Jeff
K
ing
tag: delete TAG
_
EDITM
S
G
only on successful
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub
N
a
r
ebski
g
i
tweb: M
a
ke
proje
c
t s
p
ecific overr
i
d
e
for
'
grep' featur
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
V
a
j
na
http
.
c:
u
se 'g
i
t_
c
onfig
_
s
tr
i
ng' to
g
e
t
'
c
u
r
l_http_prox
y
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
T
h
om
a
s Rast
fetch-pack: Avo
i
d
memcpy() wi
t
h src==dst
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio
C
Hamano
Update draft release 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
Mer
g
e
branch 'jc/am-opt
i
ons'
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
g
it-
a
m: r
e
name
apply
_
o
p
t_extra file t
o
apply-opt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio
C Hamano
Test that git-am does
n
ot lose -C/-p
/
--whitespace options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C Hamano
git-a
m
: propaga
t
e
-
-3way options
as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio
C
Hamano
git
-
am
:
pro
p
a
g
at
e
-
C<n>, -p<n> optio
n
s as
w
e
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-am --whitespace: do
not l
o
s
e
the command
l
ine opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lund
git-p4: Fix b
u
g in p4
W
here method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Rie
s
e
n
Report symlink
failures in merge-rec
u
rs
i
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex
Riese
n
Mak
e
chdir
failu
r
es visible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make
s
ome
of fwri
t
e/fclose/write/
c
lose
failures visible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
Junio C
Hama
n
o
M
e
r
ge branch 'd
m
/
sv
n
-remote'
commit
|
commitdiff
|
tree
2008-12-04
J
u
ni
o
C Ha
m
ano
M
e
r
ge branch 'j
n
/gi
t
web-u
t
f
8
'
commit
|
commitdiff
|
tree
2008-12-04
Jef
f
K
ing
add stage to gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
s
u
bm
o
dule: use g
i
t
r
ev-p
a
rse
-
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
rebase:
use git rev-p
a
rse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
pull: use
gi
t
r
ev
-
parse -
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
l
ost-f
o
un
d
: use git rev
-
p
ar
s
e -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
j
n
a
fil
t
er-branch:
use
g
i
t
r
e
v
-p
a
rse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Deskin Mil
l
er
git-svn: Ma
k
e b
r
an
c
h
us
e
corr
e
c
t
svn
-
remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
J
u
ni
o
C Ha
m
ano
Merge
branch 'jc/rm-i-t-a'
commit
|
commitdiff
|
tree
2008-12-03
Jun
i
o C H
a
m
a
no
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
next