repo.or.cz
/
git
/
spearce.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: leave a --cc patch when a merge could not be redone
2008-12-24
J
ohannes Schindelin
rebase -i -p: leave a --cc patch w
h
en
a merge could
.
.
.
commit
|
commitdiff
|
tree
2008-12-21
J
o
hann
e
s S
i
x
t
rebase -i -p: Fix
-
-continu
e
after a merge could not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johanne
s
Six
t
Sho
w
a failure
of
r
e
b
ase -p
i
f t
h
e mer
g
e had a conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Doc
u
mentation:
fix typos
,
grammar, asciidoc syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hama
n
o
Mer
g
e branch 'maint' to s
y
nc with GIT
1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio
C Ha
m
ano
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
fas
t
-im
p
ort: mak
e
tagg
e
r info
r
mati
o
n option
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
o
hannes
S
chindeli
n
fast-export: deal with tag
o
bjects th
a
t do not have
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
M
iklo
s
Vajna
Submitting
P
atches: menti
o
n the
u
sa
g
e
o
f
real
n
a
me in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
David
A
guilar
git-mer
g
e
t
o
ol:
p
r
o
perly
handle "git mer
g
etoo
l
-- filename"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
W
u
Fengguang
git-send-email: handle email address with quoted co
m
ma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
M
arkus Heidelberg
Do
c
u
mentatio
n
:
fix typos
,
g
r
ammar, asciidoc syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Ma
r
kus Heidel
b
erg
Documentation:
sync example output with
g
it output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
R
e
né Scharfe
Fix type-mismatch compiler warning
f
r
om diff_populate_fil
e
spec(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Mich
a
el J
G
ru
b
er
tes
t
overlapping
ignore patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Ju
n
i
o C Hamano
Merge branch 'l
t
/readli
n
k'
commit
|
commitdiff
|
tree
2008-12-18
Arje
n
Laa
r
hoven
Enab
l
e threaded delta search on Mac OS X/Darw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Nana
k
o Shirai
s
hi
Clar
i
fy
d
o
c
umentation of "gi
t
checkout <tree-ish>
pa
t
hs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
M
erge g
i
t://repo
.
or
.
c
z/gi
t
-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks documentat
i
on:
a
d
d
a note
a
bo
u
t th
e
+
x
mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
n
io
C
Haman
o
combine-diff
.
c: use
strbuf_re
a
dli
n
k()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
builtin-bl
a
me
.
c: use strbuf_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C
Hamano
make_absolute_path():
check
b
ound
s
when se
e
in
g
an
o
ver
l
ong
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus
T
orva
l
ds
Make 'prepare_temp
_
file(
)
' ign
o
re st_size for
s
y
m
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus
T
or
v
alds
Make
'
diff_populate_filespec()' use the n
e
w 'str
b
uf
_
readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus T
o
rvalds
Mak
e
'index_path()' use 'strbuf_readlin
k
()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us Torvalds
Mak
e
'ce_compa
r
e_link(
)
' us
e
the new 'st
r
buf_read
l
ink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvald
s
Ad
d
generic 'strbu
f
_readlink()' helpe
r
functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ma
r
kus Heidelberg
doc/git
-
reset:
a
d
d reference
t
o git-s
t
ash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus H
e
idelb
e
rg
Documentatio
n
:
fix description for
enabling
h
ook
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Va
j
na
git-d
a
e
m
on d
o
cum
e
ntation: use {til
d
e}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C Hama
n
o
gitweb: do not ru
n
"git diff" that is P
o
rcel
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
J
unio 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 Ham
a
no
GIT
1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Ham
a
no
gitweb: do no
t
run
"git dif
f
" th
a
t is
P
orcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee
M
arlow
bash c
o
m
p
letion: Sync con
f
ig variab
l
e
s
with their man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
L
e
e M
a
rlow
bash completion: S
o
rt
confi
g
comp
l
etio
n
variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Merge
b
r
an
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
fast-import: close pack before un
l
in
k
in
g
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Haman
o
pag
e
r: do
n
ot dup2 stderr if it is al
r
ead
y
redirecte
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
Hamano
git-show:
d
o not segfault when showing a bad tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
J
ohannes Schindelin
G
et rid of the last remna
n
ts o
f
GIT_CON
F
IG_LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Alexande
r
Gavrilov
D
o
cu
m
e
n
tation: Describe git-g
u
i Tools menu configuratio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONETAN
I
Tomokazu
git-fa
s
t
-i
m
p
ort
p
ossi
b
le memory
cor
r
uptio
n
problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Markus Heid
e
lberg
buil
t
in-commit: remove unused message variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Ham
a
no
M
e
rge branch
'
m
aint'
commit
|
commitdiff
|
tree
2008-12-13
Brand
o
n Casey
g
i
t-b
r
anch: displ
a
y sha1 on
b
ranch dele
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim Mey
e
r
ing
git-config
.
txt: fix a
t
y
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
J
u
n
i
o C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus Torvalds
fsc
k
: red
u
c
e stack
footpr
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
re
b
ase: imp
r
ove error messages about d
i
r
t
y st
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas Pitre
make sure packs
t
o b
e
replace
d
are closed beforehand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alex
a
nder P
o
tas
h
ev
Fix ty
p
o in comment in builtin-add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
u
nio C H
a
mano
Fix
t4031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jun
i
o C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: respe
c
t textconv
i
n rewrite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jef
f
Kin
g
diff: fix handli
n
g
of
b
ina
r
y rewrite dif
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potashev
Fix typos
in documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid L
u
nd
git-p4: Fix regr
e
s
s
ion in p4Where method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf
W
ildenhues
Im
p
r
o
ve lan
g
u
a
ge in git-merge
.
txt
a
n
d
related do
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
work ar
o
und P
y
thon warnings from 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 Borze
n
kov
De
f
i
n
e linkgit macro in
[
macros] se
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Mill
e
r
g
i
t-svn: Make followi
n
g
pare
n
ts
atomi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
a
kub Narebski
gitweb:
Fix bug in inse
r
t_file() subroutine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: all
o
w
turning on text
c
onv exp
l
icitly for plumbing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
reo
r
der ALLOW_TEXTCONV op
t
io
n
settin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
unio C Hamano
read-
c
ach
e
.
c:
t
y
pofix in commen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
built
i
n-checkout
.
c: check
e
rror return fro
m
r
e
ad
_
cache()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Point "stale" 1
.
6
.
0
.
5 doc
u
ment
a
tion from th
e
ma
i
n git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ha
m
a
n
o
Revert "git-stash: use git rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
J
u
nio C Haman
o
Update
d
r
a
ft rel
e
ase notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o
C H
a
mano
Merge
br
a
nch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-12-07
Juni
o
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
dif
f
<tree>{3,}": do not rever
s
e order of arguments
commit
|
commitdiff
|
tree
2008-12-07
J
e
ff King
tag:
d
elete TAG_EDI
T
M
S
G
only on successful tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub
Narebs
k
i
gitweb: Make
p
roject sp
e
c
i
fic override for 'grep' feature
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
h
t
tp
.
c: use 'g
i
t_co
n
fig_string' to get
'curl_http_proxy
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
T
ho
m
as
Ras
t
fetch
-
pack: A
v
oid memcpy()
w
it
h
src
=
=
d
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Ju
n
io C Hamano
Upda
t
e draft
r
elease notes
t
o 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Me
r
ge
branch 'jc/am-opt
i
ons'
commit
|
commitdiff
|
tree
2008-12-06
Jun
i
o C
H
amano
gi
t
-a
m
: rename appl
y
_opt_extra file to
apply-
o
p
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Jun
i
o C Hamano
Test that
g
i
t-am
d
o
es
n
ot lose -C/-p/--whitespac
e
o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
u
nio C Ham
a
no
git-a
m
: propaga
t
e --3wa
y
o
p
tions as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
un
i
o
C Ha
m
ano
g
it-am: propagate -
C
<n>, -p<n> options as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C H
a
mano
git
-
am -
-
whitespace:
do not
lose the
c
o
m
mand li
n
e option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lu
n
d
g
i
t
-p4: Fix
b
ug in p4Where method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex R
i
esen
Report sy
m
link failures
in merge-re
c
ursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex R
i
esen
Make chdir failures visible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Ri
e
sen
Ma
k
e some of
f
writ
e
/
fclose/
w
rite/close fa
i
lures visible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
J
un
i
o C Ha
m
a
no
Merge b
r
a
nch 'dm/svn-remote'
commit
|
commitdiff
|
tree
2008-12-04
Junio C Haman
o
M
erge branch 'jn/
g
itweb-u
t
f
8
'
commit
|
commitdiff
|
tree
2008-12-04
J
e
ff King
a
dd stage to gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
submodule: use
g
it rev-parse -
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase: use git rev
-
parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git rev
-
p
a
rse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
lost-
f
ound
:
use
git rev-par
s
e -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajn
a
filter-branch: use
g
i
t rev-p
a
r
se
-
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Des
k
in Mil
l
er
git-svn: Make branch use correct svn-re
m
ote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
J
unio C Hama
n
o
Merge b
r
anch 'j
c
/rm-i-t-
a
'
commit
|
commitdiff
|
tree
next