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
Cl
e
m
ens Buch
a
cher
s
imp
l
ify output
o
f c
o
nflicting merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
up
d
a
te cac
h
e for confli
c
t
i
n
g submodule entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Cleme
n
s
B
u
chacher
add test
s
for merg
i
ng with s
u
bmodul
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Mer
g
e br
a
nch
'jc
/
ma
i
n
t-1
.
6
.
0-blame-s' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
Merge
branc
h
'
j
s/
m
aint
-
diff-temp-smudge' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merg
e
bra
n
ch 'js/maint-1
.
6
.
0-exec
-
path-
e
n
v
' int
o
maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge
b
ranch '
b
c/ma
i
nt-1
.
6
.
1-bra
n
ch-de
l
ete
d
-wa
s
' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C
Ham
a
no
Merge branch 'tr
/
maint
-
1
.
6
.
1
-
doc-format-pat
c
h--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
uni
o
C Hamano
M
e
r
g
e
b
ranc
h
'dm/mai
n
t-docco'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
J
unio
C
Hamano
Merge branch 'maint-
1
.
6
.
1' i
n
t
o maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge
branch '
m
aint-1
.
6
.
0' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-01
Holge
r
Weiß
D
ocum
e
n
t
ation:
Remove an odd "instead"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portab
i
lity problem with IS
_
RUN_
C
OMM
A
ND_E
R
R
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jo
h
a
n
nes Schi
n
delin
mailmap:
resurrect lower-casing of
email addresse
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Up
d
ate dr
a
ft release notes t
o
1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio C H
a
mano
Merge b
r
anch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
M
erge br
a
nch '
m
aint-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (aka
.
.
.
Fix ba
s
h
c
omple
t
ion in p
a
th w
i
th spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thom
a
s Ras
t
bash
c
o
mpletion: o
n
l
y
sh
o
w 'log --m
e
rge' if mer
g
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nico -tel
m
i
c
h
-
Schot
.
.
.
git-tag(1): add hint a
b
out commit me
s
s
a
g
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Al
l
an Caffee
D
ocumentat
i
on: updat
e
graph api example
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hamano
Merge branch
'
maint-1
.
6
.
0'
i
n
to
main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
g
it-svn: fix
ls-tree us
a
ge with dash-prefixed paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Jo
h
annes Schind
e
lin
i
mpo
r
t-zips: fix thinko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
Me
r
ge branch 'main
t
-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-28
Emi
l
Sit
test-li
b
: Clean up comments a
n
d Make
f
ile
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Thomas
Ra
s
t
D
ocu
m
entation:
format-p
a
tch --root
c
larif
i
cation
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-26
Carlo Marce
l
o
Arenas
.
.
.
documentat
i
on:
update cvsimpo
r
t
d
escriptio
n
of "-r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-26
David J
.
Mellor
Do
c
umentation:
Remove
s
pur
i
ous uses of "you" in git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-25
Joha
n
n
es Sixt
diff -
-
no
-
index: Do n
o
t g
e
nerate patch output if
o
ther
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
Shawn O
.
Pearce
Increase
the size
o
f the
die/war
n
i
n
g
buffer to avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
Junio C Haman
o
Merge
branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-24
Junio C Haman
o
Me
r
ge
branch 'maint
-
1
.
6
.
0'
i
n
t
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-24
Li
n
us Torvalds
close_sha1_fi
l
e(): mak
e
it easier t
o
diagnose
errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
Nic
o
l
as Pitre
avoid possible ov
e
rf
l
ow
i
n
delta size
f
iltering computa
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Doc
u
mentation: min
o
r gra
m
matical fix
i
n git-che
c
k-
r
ef
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
Dav
i
d J
.
Mellor
Documentat
i
on: mi
n
or grammatical fixes in
git-check
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Document
a
tion: min
o
r grammatical fixes
i
n git-cat-file
.
tx
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
Da
v
id
J
.
Mellor
Docu
m
e
n
t
ation: minor grammatical fixes and rewordin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Docume
n
tation: rem
o
ve
some
us
e
s of the passive
voi
c
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Junio
C Haman
o
Merge branch
'
maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
i
o C Hamano
Merge
branc
h
'
m
ai
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-22
J
ohannes Schindelin
Smudge the files fed t
o
e
x
t
ernal diff and textc
o
nv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday:
u
se the
d
ashless for
m
of git-i
n
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
J
un
i
o C Hamano
Update draft rele
a
se
n
otes to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Jeff Ki
n
g
ls-files: require workt
r
e
e when --de
l
e
ted is given
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Ren
é
Scharfe
pi
c
kaxe:
c
o
u
nt regex matches only once
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Juni
o
C
H
a
mano
Merge branch 'maint-1
.
6
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2009-03-22
J
u
nio C H
a
mano
M
erge bra
n
ch
'
tr/main
t
-1
.
6
.
0-sen
d
-email-ir
t
'
into maint
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o
C Hamano
M
e
rge branch 'mg/m
a
i
n
t-submodul
e
-normaliz
e
-path' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Me
r
g
e
branch 'rs/memmem' into main
t
commit
|
commitdiff
|
tree
2009-03-22
Juni
o
C
Hamano
Merge branch 'js/rsync-local' in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
M
e
rge
b
ranch 'db/mai
n
t-missing-o
r
igin' into maint
commit
|
commitdiff
|
tree
2009-03-22
Juni
o
C
H
aman
o
Merge branch 'jc/maint-1
.
6
.
0-rea
d
-tree-overl
a
y
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
J
u
n
i
o C Hamano
M
erge branch 'js/maint-1
.
6
.
0
-path-n
o
rmalize
'
into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merg
e
branch 'jc/maint-1
.
6
.
0-pack-dire
c
to
r
y' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
S
tephen Boyd
form
a
t-
p
atch: -
-
numbered-files and --stdout ar
e
n
't
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Sixt
Prop
a
gate
-
-exec-
p
ath setting
t
o external commands
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
B
randon Casey
git
-
b
ranch:
d
i
s
play "was
sh
a
1"
on branch deletion rather
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-20
David
J
.
Mello
r
Docu
m
entation
:
reword example tex
t
in
gi
t
-bisect
.
txt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-19
Jeff King
doc: clarify h
o
w
-S works
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-19
David J
.
Mellor
Docume
n
tation: reword
e
d t
h
e "D
e
s
cript
i
on
"
section of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-18
Junio
C
Hamano
b
lame: rea
d
cust
o
m
grafts given b
y
-S before cal
l
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
Documentation: minor
grammatical fixes i
n
git-bran
c
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
David
J
.
Mello
r
Documentat
i
o
n: minor gramm
a
tical fi
x
es in git-b
l
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
Documentation: reword the "
D
e
scri
p
tio
n
" section of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
David
J
.
Mellor
Doc
u
m
entation: minor gramma
t
ical fixes i
n
git-archive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-16
J
u
n
io
C
Ha
m
a
n
o
Remove tota
l
c
o
nfus
i
on from git-fetch an
d
git-pus
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-15
J
unio C Hamano
GIT 1
.
6
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-13
Junio C
H
amano
Merge branch
'
m
a
int-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
M
erge bran
c
h 'maint-1
.
6
.
0
' i
n
to
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
M
e
rge branch 'en/maint-1
.
6
.
1-ha
s
h
-object' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hama
n
o
Merge branch 'ks/
m
aint-1
.
6
.
0-mai
l
inf
o
-fold
e
d' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio
C
Hamano
Merge branch 'cc/maint-1
.
6
.
0-bisect
-
f
ix'
i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
i
o
C Hamano
Merg
e
branch 'fg/main
t
-
1
.
6
.
0-exclude-bq' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o
C Ham
a
no
Merge branch 'js/maint-1
.
6
.
1-filte
r
-b
r
anc
h
-s
u
b
mod
u
le
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hama
n
o
Merge
b
ranc
h
'gt/m
a
i
nt-1
.
6
.
1-utf8-wi
d
th' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge branch 'js/maint-1
.
6
.
1-
r
emote
-
remove-mirror'
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C H
a
ma
n
o
Merge
b
ra
n
c
h
'ek/maint-1
.
6
.
1-fil
t
er-branch-bare' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Hamano
Merge branc
h
'
j
c
/
maint-1
.
6
.
1-ad
d
-
u-re
m
o
v
e-con
f
li
c
ted
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
unio C
H
amano
M
erge branch
'js/maint-1
.
6
.
1-rebase-i-submodule' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio
C
Ha
m
ano
Mer
g
e branch '
j
c/ma
i
nt-1
.
6
.
1-allow-uninteresting-
m
is
s
ing
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C
Hamano
Me
r
ge br
a
n
ch '
k
s/
m
aint-1
.
6
.
0-mailin
f
o-fol
d
ed'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Ha
m
ano
Me
r
ge br
a
nc
h
'jk/maint-1
.
6
.
1
-cle
a
nup
-
af
t
er-exec-fai
l
ure
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio
C
Hamano
Merge b
r
an
c
h
'
jc/ma
i
nt-1
.
6
.
0-split-diff-metainfo' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
read-tree A B C: do not create
a
bogus inde
x
a
nd do
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-12
T
ho
m
as Rast
send-em
a
il: tes
t
--no-thread --
i
n-reply-to co
m
binatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Junio C
Hamano
Update draft release
n
ote
s
for 1
.
6
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Juni
o
C Hamano
Mer
g
e br
a
nch 'js/maint-send
-
email' into maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Merge br
a
nch '
j
k/sane-relative-ti
m
e
'
into
maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Merge branch 'jc/ma
i
nt-add-p-un
q
uote'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-11
Junio
C Hamano
M
e
rge br
a
n
ch
'fg/maint-e
x
clude-bq' into maint
commit
|
commitdiff
|
tree
2009-03-11
Ju
n
io C Ha
m
an
o
Merge br
a
nch 'en/main
t
-h
a
sh-object'
in
t
o maint
commit
|
commitdiff
|
tree
2009-03-11
Joh
a
nnes Sc
h
indeli
n
rsync transport: allow
local
p
aths, and fix tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Daniel Barkalow
Give e
r
ro
r
when
no remote is configured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-08
Junio C Hamano
Merge bran
c
h
'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-07
Chr
i
s Johnse
n
b
uilt
i
n-r
e
vert
.
c
:
release index
l
ock
w
h
e
n
c
h
erry-picking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-07
Jeff Kin
g
docu
m
ent config --b
o
ol-
o
r-int
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next