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
simplify output of conflicting merge
2009-04-05
Clemens Buchacher
simplify
out
p
ut of co
n
flicting
m
erg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
up
d
ate
c
ache
f
or conflict
i
ng subm
o
dule entr
i
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
m
ens B
u
chach
e
r
ad
d
t
e
sts for mergi
n
g wi
t
h submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C H
a
mano
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merge branch
'
j
c
/maint-1
.
6
.
0
-blame-s
'
into
m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
M
e
rge branch '
j
s/maint-diff-temp-smudge' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
M
e
rge branc
h
'js/maint-1
.
6
.
0-exec-
p
ath-env' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Me
r
g
e branch 'bc/maint-1
.
6
.
1-br
a
nch-deleted-w
a
s' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch
'tr/maint-1
.
6
.
1-do
c
-forma
t
-pa
t
ch-
-
root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
r
ge
branch 'dm/maint-docc
o
'
into m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'maint-1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge br
a
nc
h
'ma
i
nt-1
.
6
.
0' into
main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-01
Holg
e
r We
i
ß
D
ocumenta
t
i
on: Remove an odd "instead"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
ing
f
i
x portability problem
with
I
S_R
U
N_COMMAND_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
o
hannes
S
chindelin
mailmap: r
e
su
r
rect lower-casing of email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
unio
C Hamano
U
pd
a
te draft
r
eleas
e
notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge bran
c
h 'maint-1
.
6
.
1
' in
t
o maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Merge branch 'maint
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Daniel Ch
e
ng (aka
.
.
.
Fix bash compl
e
tion in path with spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash completion: only
show 'log -
-
m
erge' i
f
mergi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -
t
elmich- Schot
.
.
.
git-tag(1): add h
i
nt a
b
out c
o
mmit
message
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
All
a
n Caffee
Docume
n
tation: update graph api exampl
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hamano
Mer
g
e branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge b
r
anch '
m
aint-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git-svn:
fi
x
ls-tr
e
e usage with
d
a
s
h-prefixed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Joha
n
n
es S
c
h
i
ndel
i
n
impo
r
t-zips: fix think
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Haman
o
Mer
g
e branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
test-li
b
: Clea
n
up comments and Makefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Rast
D
ocument
a
t
i
on: fo
r
mat-patch --root c
l
a
rifica
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
Carlo
M
arcelo Arenas
.
.
.
d
ocumentati
o
n
:
update cvsimport de
s
cript
i
on o
f
"-r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
David J
.
Mellor
D
o
cumentation: Re
m
ove spurious uses o
f
"yo
u
" in git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-25
Johan
n
es Sixt
diff --no-index: Do not generat
e
patch out
p
ut
if other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Sha
w
n O
.
Pearce
Increase the
s
ize o
f
the die/warnin
g
buffer to av
o
i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Junio C Ham
a
no
Mer
g
e bran
c
h 'main
t
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-24
Junio C Ha
m
ano
Merg
e
branch 'ma
i
nt-1
.
6
.
0
'
into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-24
Lin
u
s Torval
d
s
close_sha1_file(): mak
e
it ea
s
ier t
o
diagnose errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
N
i
c
ol
a
s
Pitre
av
o
id possible o
v
erflow in
d
elta
size
f
i
l
tering co
m
putation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Me
l
lor
Document
a
tion: minor grammatic
a
l
fix in git-
c
heck-ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David
J
.
M
e
llor
Documentat
i
on:
m
in
o
r
gramma
t
ical fixes in git-ch
e
ck
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
D
a
vi
d
J
.
Mellor
Documentation: m
i
nor
grammatical fixes i
n
git-c
a
t-fi
l
e
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Documen
t
a
t
ion: minor g
r
ammatical fixes and
rewording
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mel
l
or
D
ocu
m
entation: remove some us
e
s of the
p
ass
i
v
e
voice
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio
C Hamano
Merge branch 'maint-1
.
6
.
1'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-22
Junio
C H
a
mano
Merg
e
branc
h
'
m
a
i
nt-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-22
J
o
hannes Schi
n
delin
Smu
d
ge the f
i
les fed to external diff
and
tex
t
conv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
David Agu
i
lar
ev
e
ryday: use t
h
e dashless
f
orm
o
f git
-
i
n
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
J
unio C H
a
mano
Update draft release n
o
tes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
ls-file
s
: r
e
quire worktree when
-
-
deleted
i
s
given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Ren
é
Scharfe
pickaxe
:
cou
n
t
r
e
gex
m
atches only once
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge
bran
c
h
'
ma
i
nt-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-22
Junio C
Hamano
Merge
b
ranc
h
'
tr
/
mai
n
t-1
.
6
.
0-se
n
d-
e
m
a
il-irt' into maint
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
i
o
C
Hamano
M
e
r
ge branc
h
'
mg/m
a
int-submo
d
ule
-
n
o
rmalize-
p
ath' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge branch 'rs/memmem'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o C Hamano
Merge
b
ranch 'js/rsync-local' into maint
commit
|
commitdiff
|
tree
2009-03-22
Junio
C
Hama
n
o
Merge branch
'db/ma
i
nt-missing-origin' i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-03-22
Junio C
H
a
m
ano
Merge bra
n
ch 'jc/ma
i
nt-1
.
6
.
0-read-tree-o
v
er
l
ay'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
J
unio C
H
amano
Merge branch
'
js/maint-1
.
6
.
0-
p
ath-n
o
rmalize' i
n
t
o ma
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
i
o
C Hamano
Merge branc
h
'jc/maint-1
.
6
.
0-p
a
ck-dire
c
tor
y
' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Stephen Boyd
format-
p
atch: --numbere
d
-fil
e
s and --stdout aren't
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Sixt
Prop
a
gate
--e
x
ec-p
a
th set
t
ing to external
c
o
mm
a
nds
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Brandon Casey
git-b
r
anch:
d
isp
l
a
y
"was
s
h
a
1" on br
a
nch
deletion rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-20
David J
.
Mel
l
or
D
o
cum
e
n
t
ation: reword example text in git-b
i
sect
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
Jeff King
d
o
c: cla
r
ify how -S works
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
David J
.
Mellor
Doc
u
mentation: r
e
worded t
h
e "Description" section
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-18
J
unio C
Hama
n
o
blame: read c
u
stom
grafts gi
v
en by -S before
calling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
M
e
llor
Docu
m
entation:
minor
g
r
ammatic
a
l fixes in git-branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David
J
.
Mellor
Document
a
tion: minor grammati
c
al fixes
in git-
b
lam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
D
av
i
d
J
.
Me
l
lo
r
Document
a
tion: reword the "Description"
s
ection of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mell
o
r
Documentatio
n
:
m
inor grammatica
l
fixe
s
i
n
git-
a
rchive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-16
J
unio C Hamano
Remove tota
l
confusion f
r
o
m git-fetch and git-push
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-15
Junio C Hamano
GIT
1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into
mai
n
t
commit
|
commitdiff
|
tree
2009-03-13
J
un
i
o C Ham
a
n
o
Merge bran
c
h
'
maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hama
n
o
Merge branch 'en/
m
ai
n
t-1
.
6
.
1-hash-object' int
o
m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio
C Hamano
Merge bra
n
ch 'ks/maint-1
.
6
.
0-mailinfo-folded' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Hamano
Me
r
ge b
r
anch
'cc/mai
n
t-1
.
6
.
0-bisect-fix' i
n
to mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Hamano
Merge branch 'fg/m
a
i
n
t-1
.
6
.
0-e
x
c
lude-bq' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C
H
ama
n
o
M
e
rge
branch 'js/maint-1
.
6
.
1-filter-br
a
nch-submodule
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C Hamano
Merg
e
branch
'gt/m
a
int
-
1
.
6
.
1
-
utf8-w
i
dth' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
M
e
rge b
r
anch 'js/mai
n
t-1
.
6
.
1-rem
o
te-
r
e
move-mirror'
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Haman
o
Merge branch 'ek/maint-
1
.
6
.
1-fil
t
er-branc
h
-b
a
re' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge bran
c
h 'jc/
m
aint-1
.
6
.
1-a
d
d-u
-
re
m
ove-confli
c
ted
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C
Hamano
M
erge
b
ran
c
h 'js/m
a
int-
1
.
6
.
1-reba
s
e-i-subm
o
dule' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
M
e
rge
b
ranch '
j
c
/
main
t
-
1
.
6
.
1-all
o
w
-unin
t
e
resting-missing
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C Hamano
Merg
e
branch
'
k
s/m
a
int-1
.
6
.
0-mailin
f
o-folded'
into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Me
r
g
e branch
'
j
k
/ma
i
nt-1
.
6
.
1-
c
leanu
p
-
a
fter-exe
c
-failure
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio
C
H
a
mano
M
er
g
e b
r
anc
h
'
j
c/maint-1
.
6
.
0
-split-diff-metainfo'
into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
ni
o
C Hamano
read-tree A B C: do not create
a
bogus i
n
dex and do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Ras
t
send-email: test --no-thread
--in-reply-
t
o combination
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Jun
i
o C
H
amano
Update d
r
aft
r
ele
a
se
n
otes for 1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Junio
C
Hamano
Merge b
r
anch 'js/m
a
int-send-email'
into maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C
Hama
n
o
Me
r
g
e br
a
nch 'jk/s
a
ne-rel
a
tive-t
i
me' into maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Ha
m
ano
Merge branch
'
j
c/maint-add-p-unquo
t
e'
i
nto
ma
i
nt
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Merge br
a
n
ch 'fg/maint-exclude
-
bq' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-03-11
Junio
C
Ha
m
ano
M
erge branch '
e
n/maint-hash-object' into
m
aint
commit
|
commitdiff
|
tree
2009-03-11
J
o
hannes Schinde
l
i
n
r
s
ync tran
s
port: allow local paths
,
and fix tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Da
n
iel Barkalow
Give error wh
e
n no r
e
m
o
t
e is conf
i
gured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-08
Junio C Ham
a
no
Merge branc
h
'maint-1
.
6
.
1
' into
m
aint
commit
|
commitdiff
|
tree
2009-03-07
Chris Johnsen
builtin-revert
.
c: release
i
ndex lock when c
h
erry
-
picki
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
d
o
cument conf
i
g --bool
-
or-int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next