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
o
h
annes S
c
hinde
l
in
reba
s
e
-i -p:
l
eave
a --
c
c patch when a mer
g
e could
.
.
.
commit
|
commitdiff
|
tree
2008-12-21
Johannes
Sixt
re
b
ase -i -
p
: Fix
--continue after
a
merg
e
could not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johann
e
s Sixt
Sh
o
w a fa
i
lure
of rebase -p if t
h
e merge
h
a
d
a conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidel
b
erg
D
o
cumentation:
f
i
x
typos, gram
m
ar, asciidoc
s
y
ntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C H
a
mano
Mer
g
e branch 'maint'
to sync wi
t
h
G
IT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
G
I
T 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
H
amano
f
ast-im
p
ort: make tagger informat
i
o
n opti
o
nal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Joha
n
n
es Sc
h
inde
l
in
fas
t
-export: dea
l
w
i
th tag
o
bje
c
t
s th
a
t
do not hav
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
Submitti
n
gPatches: mention the usage
of
real
name i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
i
lar
gi
t
-
m
e
rgetool: properly handle
"
git merge
t
ool -- fi
l
ena
m
e"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguang
git-se
n
d-email
:
han
d
le email address with quoted comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Doc
u
mentati
o
n: fix ty
p
os, grammar
,
a
s
c
iidoc syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heidelberg
Documentation: sync exa
m
ple
o
ut
p
ut
w
i
th git
outp
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
René S
c
harfe
Fix type-mism
a
t
ch
compiler
w
ar
n
ing from d
i
ff_pop
u
late_
f
ilespec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Michae
l
J Gruber
test overla
p
ping
i
gnore pat
t
erns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Jun
i
o C Hamano
Merge branch 'lt
/
r
e
a
d
lin
k
'
commit
|
commitdiff
|
tree
2008-12-18
A
rjen Laarhoven
En
a
ble threaded delta 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
Shi
r
aishi
Clarify documentation o
f
"git c
h
eckout
<tree-ish> path
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Merge
git://re
p
o
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vaj
n
a
githooks documentation:
add a note
a
bo
u
t the +x mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hama
n
o
combine-d
i
ff
.
c: use strbu
f
_
readl
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C H
a
mano
b
u
i
ltin
-
b
lame
.
c: use strbuf_r
e
adlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio
C Hamano
mak
e
_abso
l
ute_path():
c
heck bo
u
nds when seei
n
g a
n
overlong
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nu
s
To
r
valds
Make 'prepare_te
m
p_file()' ignore
s
t
_size fo
r
sy
m
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make
'
d
iff_p
o
pulate_filespec()' us
e
the n
e
w '
s
trbuf_readlink
(
)'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus
T
orvalds
Mak
e
'in
d
ex_path()' use
'
str
b
u
f_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torva
l
ds
Ma
k
e 'ce_compare_link()' use the ne
w
'
s
tr
b
uf_readlink(
)
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
inus To
r
valds
Add generic 'strbuf_readlink()' h
e
lp
e
r function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Mark
u
s He
i
d
elberg
doc/git
-
reset:
a
dd refer
e
nc
e
t
o git-stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelbe
r
g
Documentati
o
n:
fix d
e
scription
for enab
l
ing h
o
oks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Vajna
gi
t
-d
a
emon d
o
cumentation: u
s
e {tilde}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
g
i
t
web: do not run "
g
it diff
"
that is
P
orc
e
l
ain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
io 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 Hamano
G
I
T 1
.
5
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
H
amano
GIT 1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
ni
o
C Hamano
git
w
eb: do not ru
n
"git diff" tha
t
i
s
Porcela
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Le
e
Ma
r
low
bash completion: Sync config
variables with their m
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlo
w
b
as
h
comple
t
ion: Sort
config
c
ompl
e
tion v
a
riables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Ha
m
ano
Me
r
g
e branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2008-12-16
Johann
e
s Schindelin
fast-
i
m
p
o
r
t
: close pack before u
n
linking it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Jun
i
o
C
Ha
m
ano
pager: do n
o
t dup2 stderr
i
f it
is
a
lrea
d
y redire
c
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Ju
n
io C
H
amano
git-show
:
do
n
o
t segfault when sho
w
in
g
a
b
ad tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Jo
h
annes Schindelin
Get rid
o
f
t
he
last remn
a
nts of GIT_CON
F
IG_LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Alexander Gavrilov
Docume
n
tation: Describe git-gui Tool
s
menu configura
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YON
E
TANI
Tomokazu
g
i
t-
f
ast-import po
s
sibl
e
memo
r
y cor
r
uption prob
l
em
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Markus He
i
delberg
bu
i
l
t
in-commit: remove
u
n
u
sed me
s
sage variabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hamano
Merg
e
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2008-12-13
B
r
ando
n
Casey
g
i
t-branch: display sha1
o
n bran
c
h deletion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim M
e
yerin
g
gi
t
-config
.
t
x
t: fix a t
y
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
L
i
nus Torva
l
d
s
f
sck: reduce
stack fo
o
tpri
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
rebase: improve error messages about
di
r
ty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas Pitre
m
a
k
e sure pa
c
ks to be replaced ar
e
closed befor
e
h
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ale
x
ander Po
t
ashev
Fix
t
ypo in comm
e
nt in built
i
n-add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
u
nio C Hama
n
o
F
i
x t4031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
u
n
io C Ham
a
no
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-10
Je
f
f
King
diff: resp
e
ct textco
n
v
i
n
rewri
t
e
d
i
ffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: fix
handling of binary rewrite
d
i
ffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alex
a
nder P
o
tashev
Fi
x
t
y
pos in document
a
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid Lund
git-p4: Fix regression i
n
p4Wher
e
me
t
hod
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhue
s
Impro
v
e lan
g
uage in git-merge
.
t
xt and related docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C
H
a
m
ano
wor
k
ar
o
und
P
ython warnings f
r
om 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
Bor
z
enkov
Defi
n
e linkgit
macr
o
in [m
a
cro
s
] section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Mil
l
er
gi
t
-svn: Make following pa
r
ents at
o
m
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Nareb
s
ki
gitweb: Fi
x
bug in insert_fi
l
e
() subroutin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jef
f
King
diff: al
l
ow turning on textconv
explic
i
tly for
plum
b
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff K
i
n
g
reorder
A
LLOW_TEXTCONV option setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jun
i
o C H
a
man
o
read-cache
.
c
: typ
o
f
i
x in comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C
Hamano
builtin-checkout
.
c:
c
heck e
r
ror return f
r
om rea
d
_cache()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Hamano
Point "
s
tale
"
1
.
6
.
0
.
5 documentation from
t
h
e
main git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ha
m
ano
Rev
e
r
t "git
-
stash: us
e
g
it rev-pa
r
se -q"
commit
|
commitdiff
|
tree
2008-12-07
Ju
n
i
o C Hamano
Update draf
t
rel
e
ase notes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
Merge bra
n
ch
'm
a
int'
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
GIT 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
M
a
t
t
M
c
Cutchen
"git diff <tree>{3,}": do not
r
everse order of a
r
gume
n
ts
commit
|
commitdiff
|
tree
2008-12-07
Jeff
King
t
a
g: d
e
l
ete TAG_E
D
ITMSG
only on successfu
l
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Narebski
gitweb: Make project
s
pecific override
for 'grep' fea
t
ure
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos Vajna
http
.
c:
use 'git_config_string' to get
'
curl_http_proxy
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
fetch-
p
a
c
k
:
Avoid memcpy(
)
with s
r
c==d
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C
H
a
man
o
Update draft release n
o
te
s
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
e
rge b
r
anch 'jc/am-o
p
tions'
commit
|
commitdiff
|
tree
2008-12-06
Junio C Ham
a
no
git-am: rename apply_o
p
t_
e
xtra fi
l
e
to apply-opt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C H
a
mano
Test th
a
t g
i
t-am does not lose -
C
/-
p
/--whites
p
ace options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Haman
o
gi
t
-am: pro
p
agate -
-
3w
a
y
o
pt
i
on
s
as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C
Hamano
git-am: propagate
-
C<n>, -p<n> opt
i
ons as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
u
n
io C Haman
o
git-am --wh
i
t
e
s
pac
e
: do not lose 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: F
i
x bug
i
n p4W
h
ere
m
ethod
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex
Riesen
Report syml
i
nk failures in
m
er
g
e-recursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riese
n
Make chdir
f
a
ilu
r
es vis
i
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex R
i
esen
Make some of fwrite/fclose/write/c
l
ose failures vi
s
ibl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
J
u
nio C Hamano
Mer
g
e br
a
nch 'dm/
s
vn-rem
o
te'
commit
|
commitdiff
|
tree
2008-12-04
Junio C Ham
a
n
o
Merge branch 'jn
/
gitw
e
b-ut
f
8'
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
a
dd
s
tage to gitign
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
subm
o
dule
:
u
s
e git rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vaj
n
a
re
b
a
se: us
e
git rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git
r
e
v
-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-found
:
us
e
git rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
filter-branch:
u
se git re
v
-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Deski
n
Mill
e
r
git
-
svn:
Make branch use correct svn-rem
o
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge b
r
anch 'jc/rm-i-t-a'
commit
|
commitdiff
|
tree
next