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
J
o
hannes
Sixt
rebase -i -p: Fix --continue after a me
r
ge c
o
uld not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
Show a f
a
ilure of rebas
e
-p if the merge had
a
conflic
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mar
k
us Heidelberg
Docum
e
ntation:
fix typos, g
r
ammar, asciidoc synta
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
Hama
n
o
M
e
rge
br
a
nc
h
'maint' to sync wit
h
G
I
T
1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ha
m
ano
GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
fast-import: m
a
ke tagger informati
o
n option
a
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
ohannes Schind
e
lin
fast-expo
r
t: deal with tag objects tha
t
do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
Sub
m
ittingPatches: mention t
h
e
usage of r
e
al
n
ame
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly handle "git
mergetool --
filename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguang
git-
s
end
-
email:
h
andle em
a
il addre
s
s w
i
th quoted comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
M
a
r
kus H
e
idelberg
Docum
e
nta
t
io
n
: fix
typos, g
r
ammar, asc
i
idoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
M
arku
s
Heide
l
berg
Documentati
o
n: sync exampl
e
o
utput
with
g
it o
u
t
pu
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René Scharfe
Fix
t
y
p
e-mismatc
h
c
o
mp
i
ler warni
n
g
f
r
om
diff_p
o
pulate_filespec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Mich
a
e
l
J
Gruber
test overlapping ignore
p
atterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Ham
a
no
M
erge branch 'lt/readl
i
nk'
commit
|
commitdiff
|
tree
2008-12-18
A
rjen Laa
r
h
oven
Enable
t
hread
e
d delt
a
se
a
rch o
n
Mac OS
X
/Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shiraishi
Clarify docume
n
tat
i
on of "git checkout
<
tr
e
e
-ish> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
J
unio C Hamano
Merge
g
it://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
l
os Vajn
a
githooks docum
e
ntation
:
add
a
note
about the +x
m
ode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
com
b
ine
-
diff
.
c:
u
se strbuf_readli
n
k()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
buil
t
in-blame
.
c:
use strbuf_re
a
dlin
k
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C
Haman
o
ma
k
e_abso
l
u
te_path(): c
h
eck b
o
unds when see
i
ng an overl
o
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
u
s Torvalds
Ma
k
e 'prepare_tem
p
_file(
)
' ignor
e
st_size for symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus
Torval
d
s
Make 'diff_populate_files
p
e
c()' use the new 'strbuf_rea
d
link(
)
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus To
r
valds
Mak
e
'index_pat
h
(
)' use '
s
trbuf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus Torvalds
Make 'ce_compare_li
n
k
(
)
' use t
h
e ne
w
'st
r
buf_readlink()
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Add generic 'strb
u
f_readlink
(
)' h
e
lper f
u
nct
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mark
u
s
Heide
l
be
r
g
do
c
/git-r
e
set: a
d
d refer
e
nce to
g
it-s
t
ash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus
Heidelberg
Docu
m
entation:
fix description fo
r
enabling ho
o
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-da
e
mon d
o
c
u
mentat
i
on
:
use {ti
l
de}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
g
i
tweb: d
o
not run "git diff" that i
s
Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
io
C
H
a
mano
GIT
1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Hama
n
o
GIT 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C
H
amano
G
I
T 1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
n
io
C
Hamano
gitweb: do not r
u
n "git diff" that is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Mar
l
ow
bash
c
ompletion: Sync c
o
nfig variables with their man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash completion
:
S
o
r
t
c
o
nfig com
p
letion variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C
H
amano
Merge
bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
f
as
t
-
impo
r
t: c
l
ose
p
a
ck be
f
ore unlinking it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
u
nio C
H
am
a
n
o
pager: do not dup2 st
d
err if it is
alre
a
d
y
redirec
t
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Ham
a
no
git
-
show: do
not s
e
gfault when sh
o
wing a
b
ad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schindelin
Get rid of the last r
e
mna
n
t
s
of
GIT_CONFIG_L
O
CAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
A
l
exander Gavrilov
D
ocu
m
e
n
tatio
n
: De
s
cribe
git-g
u
i Tools menu co
n
f
iguration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomokazu
git-fast-import po
s
si
b
le memory cor
r
u
ption problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Markus
H
eidelberg
builti
n
-commit: r
e
move unused messag
e
variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hamano
Mer
g
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-13
B
randon Cas
e
y
git-branch: displa
y
sha1 on bran
c
h deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim M
e
yering
git-config
.
txt: f
i
x
a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Juni
o
C Hamano
M
e
rge branc
h
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2008-12-11
L
inus Tor
v
alds
fsck: re
d
uce stack
footprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
J
eff King
rebase: improve er
r
or
messages about dirty state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Ni
c
olas Pitre
m
ake sure packs to be replaced
a
re closed beforeha
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander P
o
tashev
F
ix typo in comme
n
t in builtin-add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
F
ix t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C
H
a
m
ano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2008-12-10
Je
f
f King
diff:
respect
t
extconv in rewrite
di
f
fs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jef
f
Ki
n
g
dif
f
: fix hand
l
ing of bin
a
r
y r
e
write d
i
ffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ale
x
ander Pota
s
hev
Fix typos
in do
c
um
e
ntation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
T
o
r Arvid Lund
g
it-p4: Fix regres
s
io
n
in
p
4Where
method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
Imp
r
ov
e
language in git-merge
.
txt an
d
related docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
work ar
o
und Python warning
s
fro
m
A
sciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey
Borzenkov
Define
linkgit
m
acro in [macros] secti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Des
k
in
Miller
git-
s
vn:
Make
followin
g
parents
a
tomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebski
gi
t
w
e
b: Fix b
u
g in insert_
f
ile(
)
subroutine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: allow turning on textco
n
v explicitly for plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Je
f
f
King
reord
e
r
ALLOW_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: typofix in com
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
ama
n
o
builtin-checkout
.
c:
c
heck
e
rror return from read_cac
h
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Ham
a
no
Point
"
s
t
a
le" 1
.
6
.
0
.
5 documentati
o
n from
t
he main git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C H
a
m
ano
Revert "gi
t
-stash: use git rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Junio
C
Hamano
Upd
a
te draft re
l
ease notes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
J
unio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Junio C Ha
m
ano
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 d
i
ff <tree>{3,}":
do not reverse order of
a
r
guments
commit
|
commitdiff
|
tree
2008-12-07
J
eff K
i
ng
tag: d
e
lete
TAG_EDITMSG only on successf
u
l t
a
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Na
r
e
b
ski
gitweb:
M
a
k
e
pro
j
ect specif
i
c
o
verride for 'grep' fea
t
ure
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
Vajna
http
.
c: use
'
gi
t
_
c
onf
i
g_string' t
o
g
e
t '
c
url_htt
p
_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Tho
m
as Ras
t
fetc
h
-pack: A
v
oid
memcp
y
() with src==
d
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
J
u
nio
C
H
ama
n
o
U
pda
t
e draft release n
o
tes to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Merge branch 'jc/
a
m-
o
ption
s
'
commit
|
commitdiff
|
tree
2008-12-06
Jun
i
o C Haman
o
git-am: rena
m
e apply
_
opt_extra fil
e
to appl
y
-
opt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
unio C Hama
n
o
T
e
st that
g
it-a
m
do
e
s
n
ot lose -C/-p/--w
h
itespace op
t
ion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Ju
n
i
o C
H
amano
git-am: propagate --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> options
as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
u
nio C H
a
mano
g
it-am --whites
p
a
ce: do not
l
ose the command line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lund
g
i
t-p4
:
Fix bug in p4Where
method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Al
e
x Riesen
Report symlin
k
f
ailures in merge-re
c
ursive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Ma
k
e
chdir failures
visible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex
R
iesen
Ma
k
e some
o
f fwrite
/
fclose/wr
i
te/close failures visib
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
Juni
o
C Hamano
M
erge branch
'dm/svn-
r
e
mote'
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
M
erge branch 'jn/
g
i
tweb-utf8'
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
a
d
d st
a
ge to g
i
tigno
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodul
e
:
use
git rev-pars
e
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
r
e
b
as
e
: use gi
t
rev-pars
e
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
p
u
ll
:
use git
r
ev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
lost-found: use git rev
-
parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
n
a
filter-b
r
anch: use g
i
t r
e
v
-
parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
D
e
ski
n
Mille
r
git-s
v
n: Make
branch use correct svn-remot
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Junio C
H
a
mano
Merge branch
'jc/rm-i
-
t-a'
commit
|
commitdiff
|
tree
2008-12-03
Juni
o
C Hamano
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
next