repo.or.cz
/
git
/
mjg.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 Six
t
rebas
e
-i
-
p:
F
ix --con
t
i
n
ue
a
fter
a me
r
g
e
could n
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes
Sixt
Show a fa
i
lure of rebase -p if the merge had
a
c
o
n
f
lict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Documen
t
ation: fix typos, grammar, asciidoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C H
a
mano
Merge b
r
an
c
h 'maint' to
s
ync 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
J
u
nio
C
Hamano
fast-
i
m
por
t
: ma
k
e
t
ag
g
er
in
f
ormation
optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Johannes Schindelin
fast-export: deal
w
it
h
tag objec
t
s t
h
at do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajn
a
Submi
t
ti
n
gPatches: m
e
n
tion the usage o
f
real name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergeto
o
l:
p
roperly handle "g
i
t m
e
rgetool -- filenam
e
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fenggu
a
ng
git-send
-
email:
hand
l
e e
m
ail a
d
dress with
quo
t
ed comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mark
u
s
H
eidelberg
Documentatio
n
: fix typos,
g
rammar,
a
s
ciidoc s
y
nta
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
M
arkus Hei
d
e
lberg
Documen
t
ation: sync example
output with gi
t
outp
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
R
e
né Scharfe
Fix type-mismatch
c
ompiler warning from diff_
p
opulate_f
i
lespec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gruber
test overlapping ignore p
a
tterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C H
a
mano
Merge br
a
nch 'lt/readlin
k
'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarhoven
En
a
ble t
h
read
e
d delta search
on Ma
c
O
S X/Darwi
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shiraishi
Clarify documentation o
f
"git checko
u
t <tr
e
e
-ish>
p
a
ths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Ham
a
no
Merge git://r
e
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos
V
ajna
g
ithooks document
a
tio
n
: add a not
e
abou
t
the +x
mo
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Hamano
combine-dif
f
.
c: use strbuf_re
a
dlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C Hamano
b
uilt
i
n-blame
.
c: u
s
e
strbuf_readlink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
make_absolute_pa
t
h()
:
check bounds when
s
ee
i
ng an
o
verlon
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make
'pr
e
p
a
re_temp_file
(
)'
i
gnor
e
st_size for symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
n
u
s
To
r
v
a
lds
Make 'diff_popu
l
ate_filesp
e
c()'
u
se t
h
e new
'str
b
uf_readlin
k
()
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torva
l
ds
Make 'index_path(
)
' use 'strbuf_
r
eadlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Lin
u
s Torvalds
Mak
e
'ce_compare_link()' use the ne
w
'strbuf
_
re
a
dlin
k
()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linu
s
T
orvalds
Ad
d
ge
n
eri
c
'
s
tr
b
uf_readlink()' helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Ma
r
ku
s
Heidelberg
d
o
c/git-
r
e
s
e
t
:
add reference to git-stash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mar
k
us H
e
idel
b
erg
Documentation: fix desc
r
iption for enabling hooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
gi
t
-d
a
emon documentation: use
{tild
e
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Hamano
gitweb: do not run
"
g
it di
f
f"
t
hat is Porcel
a
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
GIT
1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
H
a
mano
GIT 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
Juni
o
C Ha
m
ano
g
itweb: do not
run
"git diff" that is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
L
ee Marlow
bash complet
i
o
n
: Sync config v
a
riables wi
t
h their man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash c
o
mpletion: Sort c
o
nfig co
m
plet
i
on variable
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Ham
a
no
Merge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schind
e
lin
fast-
i
mport: close pack befor
e
un
l
i
n
king it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Ju
n
io C H
a
mano
p
a
ge
r
: do n
o
t dup2 stderr if it
i
s alr
e
ady redi
r
e
cted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Ham
a
n
o
git-
s
how: do not segfault when
showi
n
g a bad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
o
hannes Schindelin
G
et
rid of the last remnants of GIT_CONFIG_L
O
CAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexander Gavr
i
lov
D
ocumenta
t
io
n
: D
e
scribe git-gui
To
o
ls menu con
f
i
gurat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI To
m
okazu
git-fast-imp
o
rt possible memory corruption problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Mar
k
us Heidelberg
builtin-commit: remove unused message
v
aria
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
J
u
n
i
o C Hamano
Merge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-13
Brandon Case
y
git-br
a
nch
:
displa
y
sha
1
on branch
del
e
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
git-
c
onfig
.
tx
t
: fix a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Junio C Hamano
Merge
branch '
m
aint
'
commit
|
commitdiff
|
tree
2008-12-11
Linus Torvalds
fsck: redu
c
e
s
tack footprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
r
eba
s
e: improve e
r
ror messages about dirty
s
tate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas Pi
t
re
make sure
p
acks
t
o be replaced are closed beforeha
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potashev
Fix
typ
o
in com
m
ent in bu
i
ltin-a
d
d
.
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 branch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: res
p
ect textconv in rewrite diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff Ki
n
g
diff: fix handli
n
g of binary
r
ewrite
d
iffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alex
a
n
der Po
t
ashev
Fi
x
typo
s
in documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
To
r
Arvid Lund
git-p4:
F
ix regressio
n
in
p4W
h
ere method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
Improve
l
anguage in git-merge
.
t
x
t and related doc
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
u
nio
C
Hamano
work
around Pyt
h
o
n
warnings from A
s
ciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey Borzenkov
Define linkgit macro
i
n [macr
o
s] section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
D
eskin Miller
g
i
t
-
s
vn: Make following parents atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jak
u
b
Nar
e
b
s
ki
gitweb: Fix b
u
g in insert_fi
l
e
() subrou
t
in
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: allow
turni
n
g on t
e
xtco
n
v expl
i
citly for plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
eff
K
ing
reorde
r
ALLOW_TEX
T
CONV option setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
re
a
d-cach
e
.
c: typofix in comme
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
u
nio C
H
am
a
no
builti
n
-
checkout
.
c: check
error ret
u
rn from read_cache()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
i
o C Haman
o
Point "stale" 1
.
6
.
0
.
5 d
o
cu
m
enta
t
i
o
n
fro
m
the main git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
amano
R
e
vert
"
g
it-stash: use
g
it rev-parse
-q"
commit
|
commitdiff
|
tree
2008-12-07
Juni
o
C Hamano
Update dra
f
t re
l
ease n
o
tes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o C Hamano
Merge br
a
n
c
h '
m
aint'
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
it
diff <tree>{3,}": do not reverse order o
f
arguments
commit
|
commitdiff
|
tree
2008-12-07
Je
f
f
K
ing
tag: de
l
ete TA
G
_EDITMSG only on succe
s
s
f
ul
tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jak
u
b
N
a
r
ebs
k
i
gi
t
web: Make pr
o
j
e
ct sp
e
cif
i
c o
v
erride
f
or 'grep' featur
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos Vajna
http
.
c: use 'git_con
f
i
g
_string'
to get 'cu
r
l
_
http_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thom
a
s
Rast
fetch-pack: Avoid m
e
m
cpy(
)
with
src==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Update draft
rele
a
se note
s
to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
J
u
n
io C Ha
m
ano
Merge branch 'jc/a
m
-opt
i
o
n
s
'
commit
|
commitdiff
|
tree
2008-12-06
Juni
o
C Hamano
git-am: rename 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 g
i
t-am does no
t
l
o
se -C/-p/--white
s
p
a
c
e
optio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-am: propagate --3way options as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C H
a
m
ano
git-am: propaga
t
e -C<n
>
, -p<
n
>
o
ption
s
as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hama
n
o
g
it-am --whitespace: do not l
o
se
t
h
e
command line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arv
i
d Lund
git-p4: Fix bug in
p
4Wh
e
r
e
met
h
od
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riese
n
Repo
r
t symlink failu
r
e
s
in me
r
ge-rec
u
rsiv
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
A
l
ex Riesen
Make chd
i
r failures visi
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make some
of fwrite/fclose/write/close failures
v
isible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Haman
o
Merge
b
ra
n
ch 'd
m
/s
v
n-remote
'
commit
|
commitdiff
|
tree
2008-12-04
Junio C Ha
m
a
no
Me
r
ge branch 'jn/
g
i
t
web-utf8'
commit
|
commitdiff
|
tree
2008-12-04
J
e
ff Ki
n
g
add stage to
g
i
t
i
g
nore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
su
b
module: use git rev
-
p
arse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Vajna
re
b
ase:
u
se gi
t
rev
-
pa
r
s
e -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
pull: use
gi
t
rev-p
a
rse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajn
a
l
ost-found:
use git rev-
p
arse
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-branch
:
u
s
e git rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
D
e
s
kin
M
iller
git-svn:
Make branch use correct sv
n
-remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Ju
n
i
o
C Haman
o
Merge branch 'jc/rm-
i
-t-a'
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
next