repo.or.cz
/
git
/
git-svn.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
J
ohn
Keepin
g
merge-tree:
h
andle di
r
ect
o
ry/emp
t
y conflict correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
m
e
rg
e
-t
r
e
e
: fix typo in "b
o
th ch
a
nged identically"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eep
i
ng
m
e
rge
-
tre
e
: don't print entries th
a
t
matc
h
"local"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-27
John
Kee
p
ing
m
erge-tr
e
e: fix typo i
n
merge-tr
e
e
.
c:
:
unresolved
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-27
Chri
s
tian Helmuth
git-commit
doc: describe use
o
f
multip
l
e `-m` opti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-27
Mihai Capot
ă
git-pull doc: f
i
x
grammo ("confl
i
cts
"
is
p
lural)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-26
Dan Bornstein
Correct the
d
o
c
s
a
b
out G
I
T
_SSH
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-25
J
unio C
H
a
mano
Merge branch 'l
f
/bundle
-
v
erify-list-prereqs' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
J
u
nio C Ha
m
ano
M
erge branch
'
tk
/
doc-filt
e
r-branch' into main
t
-
1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Junio C Hamano
Mer
g
e branch
'dm/
n
i-maxhost-may-be-
m
issing' i
n
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Juni
o
C H
a
mano
Merge branch
'
gp
/
describe-ma
t
ch-
u
ses-glob-pattern'
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Junio C Hamano
Merge
branch
'nd/
d
oc-index-format' in
t
o
m
aint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Junio
C
Hamano
Merge branch 'wk/d
o
c
-pre-rebase' into maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Ju
n
io C Ham
a
no
Merg
e
bra
n
ch 'jc/c
o
lor-diff-doc' into maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-17
Kacpe
r
Kornet
t150
7
: T
e
st that branchname@{upstre
a
m
}
is i
n
t
e
rprete
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-17
Kac
p
er Kor
n
et
rev-parse: c
l
arify do
c
umentati
o
n of $name@{upstream
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-17
René
S
charfe
sha1_name: pass object
n
ame length to
diagnose_i
n
valid_
s
ha1_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-17
René Scharfe
Makefile
:
keep LIB_
H
ent
r
ies together and
s
orted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-11
K
evin Bra
c
e
y
git
.
c: make usage match ma
n
u
a
l p
a
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Bracey
Translate gi
t
_more_info_str
i
ng con
s
i
s
tently
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-09
Antoine Pelisse
perf: u
p
date doc
u
me
n
tation of GIT
_
PERF_REPEAT_
C
O
UNT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-08
Lu
k
as Fleischer
bundle: Add colons to list headings in "verify"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-07
Lukas Fleisc
h
e
r
bun
d
le: Fix "verify" output if h
i
story i
s
co
m
pl
e
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-07
J
un
i
o
C
Hamano
Me
r
ge branch 'mh/ma
i
nt-ceil-ab
s
o
l
ute
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2013-03-07
Fredrik Gustafss
o
n
gitweb/README: remove re
f
e
r
en
c
e
t
o git
.
k
e
rnel
.
org
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
J
u
n
i
o C Hamano
Git 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Thomas
R
ast
M
ake !pattern
i
n
.
g
i
tattri
b
ut
e
s
n
o
n-fatal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Junio C Hamano
Me
r
ge bran
c
h
'
wk/user-man
u
al' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2013-03-01
Andre
w
Wong
Document
a
tio
n
/githooks: Fix li
n
kgit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-27
Ju
n
io C Haman
o
Update draft release not
e
s to 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
Merge
b
ranch 'ef/non
-
a
s
cii-par
s
e-options-error-diag
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio
C Hamano
Merge
branch
'wk/man-deny-current-branch-is-
d
efault
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
J
u
n
io C Hama
n
o
Mer
g
e bran
c
h
'jn/less-
r
econfigure' into maint
commit
|
commitdiff
|
tree
2013-02-27
B
r
a
d
Ki
n
g
Do
c
umentation/submo
d
ule:
A
dd --force to upd
a
te sy
n
o
psis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-26
Ta
d
eu
s
z Andrzej
.
.
.
Documentation: filter-
b
r
a
n
c
h e
n
v
-filter
e
xample
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-26
Tadeusz Andrzej
.
.
.
git-filter-branc
h
.
txt: clar
i
fy ident variabl
e
s usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Michael
git-compat-util
.
h
: Provid
e
missing ne
t
db
.
h
defini
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio C
Haman
o
Prep
a
re
f
or 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C
H
amano
Merge b
r
an
c
h '
j
c/mention-tracking
-
for-pull-def
a
ult
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
J
unio C H
a
mano
Mer
g
e
branch 'mm/confi
g
-
i
n
t
r
o
-in-git-doc' into
m
aint
commit
|
commitdiff
|
tree
2013-02-25
J
u
n
i
o C
Haman
o
Merge
branch 'd
a
/p4merge-m
k
temp-fix' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ha
m
a
n
o
Merg
e
branch '
b
w/get-tz-offset-
p
erl'
into
maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
Mer
g
e branch 'al/mergetool-printf-
f
ix' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch 'j
x
/utf8-printf-width
'
into m
a
int
commit
|
commitdiff
|
tree
2013-02-25
Junio C
Ham
a
no
Mer
g
e
b
r
an
c
h 'mg/bisect-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Merge branch 'sp/smart-http-cont
e
nt-type-c
h
eck'
into
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
no
Merge bra
n
ch 'jc/
c
ombine-diff-ma
n
y-
p
are
n
t
s'
i
nto m
a
int
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merg
e
bran
c
h 'jk/app
l
y-similaritly
-
parsing' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Mer
g
e branch 'jk/remote
-
helpe
r
s-doc' into maint
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C
Hamano
Merge b
r
anch
'
a
b/gitwe
b
-
u
s
e-
s
a
m
e-sc
h
eme' into maint
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C
H
amano
Merge branch 'zk/c
l
ean-r
e
port-failure'
i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ha
m
ano
M
erge branch 'nd/clone-no-separate-git-dir-with-bare
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Mer
g
e branch 'da/p4
m
e
r
ge-mktemp' into maint
commit
|
commitdiff
|
tree
2013-02-25
Gre
g
Price
Doc
u
ment
a
tio
n
: "ad
v
ice" is uncountable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Greg Price
desc
r
ibe: D
o
cument --
m
at
c
h
p
att
e
r
n format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-24
W
.
Trevor King
Documentation
/
g
i
t
ho
o
ks: Explain pre-rebase paramete
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-23
Nguyễn Thái Ngọc
D
uy
update-index: list s
u
p
p
orted i
d
x versions and their
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-23
Junio C Ham
a
no
diff
-
options: unconfuse
d
escri
p
tion of --
c
o
l
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-22
Nguy
ễ
n T
h
ái Ngọc D
u
y
r
ea
d
-cache
.
c: use IND
E
X_FORMAT_{LB,UB
}
in
verif
y
_hdr()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-22
N
guyễn Thái Ngọc
D
uy
index
-
format
.
t
xt: menti
o
n of
v4 is missin
g
in
s
ome
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-22
Mic
h
ael Haggert
y
P
r
ovide a mec
h
an
i
s
m
t
o t
u
rn off symlink
res
o
lution
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-21
J
eff K
i
n
g
M
a
kefile: avoid
i
nf
i
nite loop
o
n configure
.
ac change
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Junio
C Hamano
Git
1
.
8
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Junio
C Hama
n
o
Merge bran
c
h
'
ob/im
a
p-send-ssl-verify' into maint
commit
|
commitdiff
|
tree
2013-02-20
O
swa
l
d
Budde
n
hagen
imap-send: support subjectAltName as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Oswald
Buddenha
g
e
n
imap-send
:
the
subj
e
c
t of SSL certificate must match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
user-
m
an
u
al: Fles
h
ou
t
uncommitted changes and submodu
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor
K
ing
user-manual: Use reque
s
t-p
u
ll to generate "please pull
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
u
ser-manual:
R
e
organ
i
ze t
h
e
rerol
l
secti
o
ns,
adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
Junio C Hamano
imap-send: move
#ifd
e
f around
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
Jun
i
o C Hamano
user-manual:
t
ypofix (ofthe
-
>
of the)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor K
i
n
g
user-man
u
al: use -o lates
t
.
t
a
r
.
gz t
o
create
a
gzipped
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor King
user-manual: us
e
'gi
t
confi
g
--g
l
obal user
.
*'
for
se
t
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
T
revor King
user
-
man
u
al: mention 'git
r
emote add' for remote b
r
anch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trev
o
r
K
i
n
g
use
r
-m
a
nual:
give 'git
p
ush -
f
' as an
a
lt
e
rnativ
e
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor King
user-
m
an
u
al:
u
se
'
remote add' to setup push URLs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-15
Ma
t
thieu Moy
git
.
txt:
u
p
d
ate description of the c
o
nfigurat
i
on mechanism
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-14
W
.
Trevor King
user
-
m
a
nual
:
Updat
e
for receiv
e
.
d
enyCurrentBr
a
nch=
r
e
f
use
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
Matthieu Moy
Replace filepattern wit
h
pathspec
for consistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Erik Faye-Lund
parse-opt
i
on
s
: rep
o
rt unc
o
rrupte
d
mult
i
-byte options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Jiang Xin
Add utf8_f
p
ri
n
tf he
l
per t
h
a
t retu
r
ns correct number
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Mich
a
el J Gru
b
er
g
i
t-bisect
.
txt:
cl
a
r
ify
that reset q
u
i
t
s bisect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor K
i
ng
use
r
-manual: Rewrite git-
g
c se
c
tion for automatic
p
acking
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor
King
user-manu
a
l:
F
ix
'you -
G
it' -> 'you--Git' typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor King
user-manual: Fix 'http' -> 'HT
T
P' typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-10
W
.
Trevor King
us
e
r-manual: Fix 'both: so' ->
'
b
oth; so'
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
Agu
i
lar
p4merge
:
fix pri
n
tf usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
diff
t
o
o
l--helper: fix printf usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
Ben W
a
lton
cv
s
i
mport
:
fo
r
mat co
m
mit
timestamp ourselves
with
o
ut
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
Ben W
a
lton
perl/Git
.
pm: fix g
e
t
_
t
z
_
offset to proper
l
y handle DS
T
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
B
e
n
Wal
t
on
Move
G
i
t::
S
VN::get_tz
to Git::get_tz_offset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-08
Asheesh Lar
o
ia
git-mergetool: print filename when i
t
contains %
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Git 1
.
8
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
Junio C H
a
mano
Merge
branch
'mz
/
p
i
ck-unborn' into maint
commit
|
commitdiff
|
tree
2013-02-07
J
unio C Hamano
M
erge bran
c
h 'nd/fix-pe
r
f-parameters-in
-
tes
t
s' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio
C Hamano
Mer
g
e
br
a
nch 'jc
/
d
o-not-let-ran
d
om-
f
ile-interfere-
w
ith
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio
C Hamano
Merge
b
r
anc
h
'ft/t
r
an
s
po
r
t-repor
t
-segv' into
m
ai
n
t
commit
|
commitdiff
|
tree
2013-02-07
Junio C Haman
o
Merg
e
br
a
nch 'sb
/
gpg-plug-fd-leak' into maint
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
M
e
rge
b
ranc
h
'jc
/
fake-ancestor-with-non-blo
b
s' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
J
u
n
i
o C Hama
n
o
M
erge
b
ranch 'jn/auto-depend-worka
r
ound-bug
g
y
-cc
a
che
.
.
.
commit
|
commitdiff
|
tree
next