repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-tree: handle directory/empty conflict correctly
2013-05-07
John Keep
i
ng
m
e
r
ge-tr
e
e: handle
d
irectory/empty con
f
lict correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
John
Keepi
n
g
mer
g
e
-
tree
:
fi
x
typ
o
in "both change
d
identicall
y
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
ng
merge-tree:
don't print entr
i
e
s
t
hat match "local"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-27
John Keepi
n
g
merge-tr
e
e: fix typo in merge-tree
.
c::unresolve
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-27
Christian Helmuth
git-commit
doc:
describe
u
se of mu
l
tipl
e
`
-
m
` options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-27
Miha
i
Capotă
git-pull doc:
f
ix grammo ("conflic
t
s
"
i
s
p
lural)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-26
Dan Bor
n
stein
C
orrect the docs
ab
o
ut
GIT_
S
SH
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-25
Junio C Hamano
Merge br
a
nch 'lf/bun
d
l
e
-
ve
r
ify-list-prere
q
s' into maint
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Juni
o
C Hamano
Merge branch 'tk/doc-fil
t
e
r-b
r
anch' in
t
o m
a
i
nt
-
1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
J
u
nio C Hama
n
o
M
e
rge bra
n
ch
'dm/ni-ma
x
h
ost-may-be-missing
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Junio C Hamano
Merge branch
'gp/describe-match-uses-
g
lob-pattern'
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Junio C Hamano
Merge branch 'n
d
/doc-inde
x
-for
m
at' into maint
-
1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
J
unio C Hamano
Merge branch 'wk/d
o
c
-
pre-rebase' i
n
to maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Junio
C Hamano
Merge
branch 'jc
/
color-diff-doc' int
o
maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-17
Ka
c
per
Kornet
t1507: Test tha
t
branch
n
ame@{upstre
a
m} is interpreted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
K
a
cper Ko
r
n
et
rev-parse: clari
f
y docume
n
tat
i
on of $
n
am
e
@{upstream
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
R
ené Scharfe
sha1_
n
am
e
: pass
o
b
ject nam
e
le
n
gt
h
to di
a
gnose_invalid_sha1_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
René Scharfe
Makefile: keep
L
I
B
_
H
entries
together
and s
o
rted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
git
.
c: make usage match manua
l
p
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-10
Kevin B
r
a
c
ey
Tr
a
nslate g
i
t_
m
ore_info_string
c
o
nsistently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-09
Antoine P
e
lisse
perf: upda
t
e
d
o
cumentation of GIT
_
PE
R
F_REPEAT_COUNT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-08
Lu
k
as Fleisc
h
e
r
bu
n
dle
:
Add colons to list headings in
"
verify"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
Lu
k
a
s
F
leischer
bundle:
F
ix "ver
i
fy" outp
u
t
if
h
istory
i
s complete
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
Junio C Hamano
Merge branch 'm
h
/maint-ceil
-
absolute'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2013-03-07
Fredrik
Gustafs
s
on
gitweb/README
:
r
e
m
ove r
e
feren
c
e to
g
it
.
ker
n
el
.
org
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Junio C Hamano
G
it
1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Thomas
Ras
t
Make
!
pattern i
n
.
gitattr
i
butes non-fatal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Jun
i
o
C
Hamano
M
erge bra
n
ch
'wk/user-m
a
nual'
i
n
to maint
commit
|
commitdiff
|
tree
2013-03-01
Andrew
Wong
Docu
m
e
n
tation/githooks:
Fix lin
k
g
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-27
Ju
n
i
o C
H
amano
U
pdate d
r
aft r
e
lea
s
e no
t
es to 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-27
Junio C H
a
ma
n
o
Merge
b
ranch
'ef/non-ascii-
p
arse-
o
p
t
i
ons-er
r
or-diag
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio
C
Hamano
Merge branch 'wk/ma
n
-deny-current-branc
h
-
is-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Ju
n
io C Hamano
Merge br
a
n
ch 'jn/less-reconfigure
'
i
nto
maint
commit
|
commitdiff
|
tree
2013-02-27
B
rad King
D
o
cumentat
i
on/subm
o
dule: Add --force
to update
synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-26
Tad
e
us
z
And
r
zej
.
.
.
Documenta
t
i
on: filter-br
a
nch env-filte
r
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-26
Tadeusz A
n
d
r
z
e
j
.
.
.
gi
t
-filter
-
b
ra
n
ch
.
txt: clarify
i
dent var
i
ables usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
David Michael
git-c
o
mpat
-
util
.
h:
P
r
ovide missi
n
g netdb
.
h def
i
ni
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Hamano
Prepare f
o
r 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C H
a
m
ano
Merge
b
r
a
nch 'jc/mention-
t
r
a
c
king-for-pull-
d
e
f
ault
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Hamano
Merge branch
'
m
m/config-intro-in-
g
it-doc' into maint
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o
C Hamano
M
erg
e
bran
c
h 'da/p4merge-mktemp-fix
'
into m
a
int
commit
|
commitdiff
|
tree
2013-02-25
Junio
C Hamano
M
e
rge b
r
anc
h
'bw/g
e
t-tz-offset-pe
r
l' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Merg
e
br
a
nc
h
'al/mergetool-
p
rintf-
f
ix' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge bran
c
h
'jx/utf8-printf-width' into
maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
no
Mer
g
e branch 'mg/bisect-doc' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch
'
sp/s
m
art-h
t
tp-content-typ
e
-check' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge br
a
n
c
h
'jc/combine-di
f
f-many-parents'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
J
unio C Hamano
M
e
r
ge br
a
nch 'jk/app
l
y-similaritl
y
-
p
arsing' into maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hama
n
o
Merge b
r
anch 'jk
/
remote-
h
el
p
ers-doc' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Ham
a
no
Merge bran
c
h 'ab/g
i
tweb
-
use-same-scheme'
in
t
o maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C
H
ama
n
o
Mer
g
e b
r
anch
'z
k
/clean-report-fai
l
ure' into maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
n
io C Hama
n
o
M
erg
e
b
ranch
'
nd/clone-no-s
e
para
t
e-gi
t
-dir-with-b
a
re
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o C Hamano
M
erge
branch
'
da/
p
4me
r
ge-mktemp' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2013-02-25
Greg
P
r
ice
Documentation: "advice" is
uncountable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Gre
g
P
rice
describe:
Document --match pattern format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-24
W
.
Trevor
King
D
ocumenta
t
io
n
/githook
s
: Exp
l
ain pre-rebas
e
p
a
r
a
meters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-23
Nguyễn Thái
N
gọc Du
y
update-inde
x
: list supported i
d
x versio
n
s and their
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-23
Junio C Hama
n
o
diff-
o
ptions
:
unconfuse descr
i
ption
o
f --col
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-22
N
guyễn Thái Ngọc D
u
y
read-cache
.
c: us
e
INDEX_FORMAT
_
{LB,UB} in verify_hdr()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-22
Nguyễn Thái Ngọc Duy
index-format
.
txt: men
t
i
on of v4 is mis
s
ing in
s
o
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-22
Michael Hag
g
erty
P
rovide a mechanism to tur
n
off sy
m
link resol
u
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-21
Jeff Ki
n
g
Makef
i
le: a
v
oi
d
inf
i
ni
t
e loop on
c
o
n
figure
.
ac
c
h
ange
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-20
J
u
nio C Ham
a
n
o
Git 1
.
8
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-20
Junio C Hamano
Me
r
ge branch 'ob/imap-
s
end-ssl
-
verify' into
m
aint
commit
|
commitdiff
|
tree
2013-02-20
Oswald B
u
ddenhagen
ima
p
-send: support
s
ubjectAlt
N
ame as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-20
Oswald Budden
h
agen
imap-
s
end: th
e
subject
of SSL
c
erti
f
ica
t
e
m
ust
m
atch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
user-
m
anual: F
l
e
sh out unc
o
mmitted ch
a
nges and submodule
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor Ki
n
g
u
ser-manu
a
l:
U
se r
e
quest-pu
l
l
t
o
generate "please
p
u
ll
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trev
o
r
K
ing
user-m
a
n
u
al: Reorganize the r
e
roll sections, adding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
Junio C Hamano
i
map-se
n
d
:
move #ifd
e
f around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
Junio C Hamano
user-manual: typo
f
ix (ofthe->of the)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
T
revor K
i
n
g
user-manu
a
l:
u
se
-o latest
.
tar
.
gz to
create a gzippe
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor King
user-manual: u
s
e
'
git config --glo
b
al use
r
.
*' for setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Tre
v
or King
user-
m
a
n
ual: men
t
ion 'git r
e
mote add' for
r
emote branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor King
user-ma
n
ua
l
: give 'gi
t
push -f' as an alternative t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor King
user
-
m
anual: use
'remo
t
e add
'
to
s
e
tup
p
u
s
h URLs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-15
M
a
t
t
hieu Moy
git
.
t
x
t: update de
s
cripti
o
n of the configuration
m
ec
h
an
i
sm
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-14
W
.
Trevo
r
King
user
-
m
anual: Up
d
a
te for rece
i
ve
.
de
n
yCurre
n
tBran
c
h=refuse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-12
Matthieu Moy
Replace filepat
t
e
rn w
i
t
h
pathspec for
c
o
n
sistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-11
Erik Faye-Lund
parse-options: report u
n
corrupted multi-byte option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-11
Jiang Xin
Add utf8_fprintf
he
l
per that returns co
r
rec
t
number
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-11
Michael J
G
ruber
git-bisect
.
txt: clarify that reset
q
uit
s
bisec
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-11
W
.
T
rev
o
r King
user-manual: Re
w
rite git-gc
sect
i
on f
o
r
automa
t
ic pac
k
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Tr
e
vor
King
user-m
a
nual: Fix 'yo
u
- Git' -> 'you--Git'
t
ypo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor King
user
-
m
a
nual:
F
ix 'http' -> '
H
TTP' typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-10
W
.
Tre
v
o
r
King
u
ser-manual: Fix 'both: so' -> 'both; so
'
typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
p4merge: fix
p
rintf
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--
h
el
p
e
r:
fix pr
i
ntf usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-09
Ben Wa
l
ton
cvsimport: f
o
rm
a
t commit timestamp oursel
v
es
w
itho
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-09
Ben Walto
n
perl/Git
.
pm: fix g
e
t
_t
z
_offset
t
o
proper
l
y handle DST
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-09
Ben Walton
Move
G
it::SVN::get_tz to Git::g
e
t_tz_offse
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-08
Asheesh Laroia
git-mergetool: print filena
m
e wh
e
n it con
t
ains %
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-07
J
u
nio C Ham
a
no
Git 1
.
8
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-07
Junio C
Hamano
M
e
rge
branch '
m
z/pick-u
n
born'
i
nto maint
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Mer
g
e
b
ranch 'nd/fix-p
e
rf
-
p
a
r
amete
r
s
-in-tests' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
J
u
nio
C
Hamano
M
e
rge b
r
an
c
h 'jc/do-not-let-rand
o
m-file-inter
f
ere-with
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge branch '
f
t/transport-re
p
ort-segv' into maint
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Hamano
Mer
g
e
branch
'sb/gpg-p
l
ug-fd-leak
'
into m
a
in
t
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Haman
o
Merge branch 'jc
/
f
ake
-
an
c
estor-w
i
t
h
-
n
on-blob
s
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Ju
n
io C Hamano
M
erge branch 'jn/auto-d
e
pend-workaround
-
b
u
ggy-ccache
.
.
.
commit
|
commitdiff
|
tree
next