repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge-one-file: send "ERROR:" messages to stderr
2013-03-25
Kevin Bracey
git-merg
e
-one
-
file: send "ERROR:
"
messages to s
t
de
r
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git-merge-one-fi
l
e: style
c
leanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-25
Junio C Ha
m
ano
m
e
rge-one-
f
ile: r
e
move
s
tale
c
omment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
m
e
rgetools/p4merge: cr
e
at
e
a base if none
a
vaila
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Br
a
c
e
y
mergetools/p4merge: swa
p
LOCAL
a
nd
REMOTE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-09
Jun
i
o C Ha
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-03-09
A
n
toine Pelisse
p
e
rf: update d
o
cu
m
entation of
G
I
T_PERF_REPEAT_
C
OUN
T
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-08
Junio C
Hamano
Merge gi
t
://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2013-03-08
Junio C Ha
m
ano
U
p
date dr
a
ft releas
e
notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
Junio C
H
amano
Git
1
.
8
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
Juni
o
C Hamano
Merge git
:
//github
.
com/
g
it-l10n/
g
it-
p
o
commit
|
commitdiff
|
tree
2013-03-07
Junio C
H
a
mano
Merge br
a
nch 'mp/complete-paths
'
commit
|
commitdiff
|
tree
2013-03-07
Junio C Hamano
Mer
g
e b
r
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2013-03-07
Junio C Ha
m
a
no
Merg
e
branch '
m
h/
m
a
int-
c
eil-absolute' into maint
commit
|
commitdiff
|
tree
2013-03-07
Fr
e
drik Gust
a
fsson
gitweb/README:
r
emo
v
e
reference
to git
.
k
e
rnel
.
o
r
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-05
M
atthieu Moy
git-completion
.
zsh: de
f
ine
__gitco
m
p
_file c
o
m
patibilit
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-04
Junio C
Hamano
Merg
e
git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-03-03
Junio C Hamano
Git 1
.
8
.
2
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Junio C Ham
a
no
Sync wit
h
1
.
8
.
1
.
5
commit
|
commitdiff
|
tree
2013-03-01
J
u
nio C H
a
man
o
Git 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Thom
a
s Rast
Ma
k
e !p
a
ttern in
.
gi
t
attrib
u
tes non-fatal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Junio C Hamano
M
erge branch 'wk/user-
m
a
n
u
al'
i
nto maint
commit
|
commitdiff
|
tree
2013-03-01
Andrew Wong
Documentation/gith
o
ok
s
: Fix linkgit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
Me
r
ge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2013-02-27
Junio C
H
amano
Upda
t
e draft
releas
e
n
o
te
s
to 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-27
Junio C Ha
m
ano
Mer
g
e
b
r
a
n
ch
'ef/non-as
c
i
i
-parse-op
t
ions-error-diag
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
J
unio C Hamano
Merge b
r
anch
'
wk/man
-
deny-current-bra
n
ch-is-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Ju
n
io C Ha
m
a
no
Merg
e
branch 'j
n
/less-rec
o
n
f
igure' in
t
o m
a
int
commit
|
commitdiff
|
tree
2013-02-27
J
uni
o
C Hamano
Me
r
ge branc
h
'mh
/
m
aint-
c
eil-absolute
'
commit
|
commitdiff
|
tree
2013-02-27
Brad
King
Docum
e
ntation/submodu
l
e: Add
--force to update
synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-26
J
u
nio C Hamano
Merge branch 'fo
r
-ju
n
io' o
f
git
:
//github
.
co
m
/
kusma/git
commit
|
commitdiff
|
tree
2013-02-26
Erik Fay
e
-
L
und
Revert "
c
o
m
pa
t
:
add
s
trt
o
k
_r()"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io
C H
a
m
a
no
Git 1
.
8
.
2-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Junio C
H
am
a
n
o
M
e
rge git://gith
u
b
.
com/git-l1
0
n/g
i
t-po
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
i
o
C Haman
o
Sync with 'maint'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io
C
Hamano
Merge branch 'wk/use
r
-manual
'
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
H
amano
M
erge branch 'jn/less-reconfigure'
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio
C Hamano
Merge
branch
'as/c
h
eck-ignore'
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch 'ct/au
t
oconf-htmld
i
r'
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Hamano
Mer
g
e br
a
nch
'wk/m
a
n-deny-c
u
rre
n
t-branch-is
-
defa
u
l
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Ha
m
ano
Prepare for 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Merge branch 'jc/mention-tracking-
f
or-pul
l
-defau
l
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C
Hamano
Merge branch 'mm/config
-
intro-in-
g
it
-
doc' into
m
aint
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Merge branc
h
'da/p4merge-mkte
m
p-fix' into
maint
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o C Hama
n
o
Merge
b
ranc
h
'bw/get-tz-offset-perl' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ha
m
ano
Merge branch
'al
/
mergetool-printf-fix'
into maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
M
erge b
r
anch 'jx/
u
tf8-pr
i
ntf-width' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Hamano
Merge bra
n
c
h
'mg/bi
s
ect-doc' into m
a
int
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge br
a
nch
'
sp/smart-h
t
tp-c
o
nten
t
-
type-check' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Me
r
ge
branch
'
jc/combine-diff
-
many-par
e
nts' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge br
a
n
ch '
j
k/apply-
s
imilaritly-par
s
i
ng' into ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
M
erge
b
ranch 'jk/remote-he
l
pers-doc' into main
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
no
Merge b
r
anch 'ab/g
i
tweb-use-s
a
me-scheme' into maint
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o C Hamano
Merge branch
'zk/clea
n
-report-failure'
i
nto maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge
b
ran
c
h 'nd/clo
n
e-no-separate-git-dir-w
i
th-bare
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o C H
a
mano
Merge
b
r
anch 'da/p4merge-
m
ktem
p
'
into main
t
commit
|
commitdiff
|
tree
2013-02-25
Greg Price
Doc
u
mentati
o
n
:
"advic
e
"
is uncountable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-22
Micha
e
l H
a
ggerty
Provide a mecha
n
ism to turn off sym
l
in
k
r
es
o
l
ution
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-21
Jeff Ki
n
g
Ma
k
efile: avoid infi
n
i
t
e l
o
op
o
n
c
o
nfigure
.
ac chan
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-20
Junio C
H
amano
S
y
nc with v1
.
8
.
1
.
4
commit
|
commitdiff
|
tree
2013-02-20
Junio 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
Ju
n
io C Hamano
Merge branch 'ob
/
imap-
s
end-ssl-verify
'
into
maint
commit
|
commitdiff
|
tree
2013-02-20
Oswald Buddenhagen
imap-send: supp
o
rt
subjectAltName a
s
w
ell
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-20
Osw
a
ld Buddenha
g
en
imap-sen
d
: the
s
ubject of
SSL cer
t
ificate mus
t
match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
Jiang Xin
Bugfix:
u
ndefin
e
d h
t
mld
i
r in config
.
mak
.
autogen
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
Junio C
Hamano
n
ame-hash: allow hashing an e
m
p
t
y
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Tre
v
or K
i
ng
user-ma
n
ual
:
F
l
esh
out u
n
committed
cha
n
ge
s
a
n
d
s
ubmodule
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
u
s
er-
m
anual: Use r
e
quest-pu
l
l to generate "pleas
e
p
ull
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
user-manual:
R
eorgan
i
z
e
the rerol
l
sections, adding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
Adam Spiers
t0008: documen
t
test_e
x
p
e
ct_success
_
multi
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
Jun
i
o
C
H
am
a
no
i
map-
s
end:
m
o
ve #if
d
ef
around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
Junio
C
H
a
mano
M
e
rge br
a
nch
'jc/mention-
t
racking-fo
r
-p
u
ll-default
'
commit
|
commitdiff
|
tree
2013-02-19
Ju
n
i
o
C Hama
n
o
M
erg
e
b
ranch 'mm/co
n
fig
-
i
n
tro-i
n
-git-do
c
'
commit
|
commitdiff
|
tree
2013-02-18
Jun
i
o C H
a
mano
RelNotes
1
.
8
.
2
:
p
ush-simple will not be in effect in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
Martin Erik Werner
shel
l
-prompt: clean up n
e
st
e
d if-t
h
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
J
unio C
Ha
m
ano
user-man
u
al:
t
ypofix (ofth
e
->of th
e
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
Junio C
H
amano
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor K
i
n
g
u
se
r
-manual: use
-o latest
.
tar
.
gz t
o
c
r
eate a g
z
ipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
T
r
e
vor King
user-manual: us
e
'gi
t
config --
g
lob
a
l user
.
*' for setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor King
user-manual:
m
ent
i
on '
g
i
t remote
a
dd'
for remote bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor King
u
ser-m
a
nual: giv
e
'git p
u
sh -f' as
a
n altern
a
t
i
ve to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Tre
v
or
K
ing
us
e
r-manua
l
: use 'rem
o
te add' to
s
etup push URLs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
Jun
i
o
C Hama
n
o
Merge git:/
/
github
.
com/git-l10
n
/
g
i
t-po
commit
|
commitdiff
|
tree
2013-02-17
Junio
C Ham
a
no
Git 1
.
8
.
2-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-17
Juni
o
C H
a
mano
Merge branch
'
jc/hidden-refs'
commit
|
commitdiff
|
tree
2013-02-17
Junio
C Hamano
Merge br
a
nc
h
'mp/diff-algo-config'
commit
|
commitdiff
|
tree
2013-02-17
Junio C Hamano
Merge branch 'mw/bash-prompt-show
-
untracked-config'
commit
|
commitdiff
|
tree
2013-02-17
Junio C Hamano
Merg
e
branch 'jk/re
b
a
se-i-comment-char
'
commit
|
commitdiff
|
tree
2013-02-17
Junio C Ham
a
no
Mer
g
e branch '
j
k/read-commit-b
u
f
fe
r
-
d
a
ta-after-fr
e
e'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Update draft release not
e
s to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-15
Matthieu
Moy
git
.
txt: updat
e
description of the configuration mechanism
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-15
Jun
i
o C Hamano
M
e
rge branch '
w
k/man-deny-current-branch-is-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Merge b
r
a
n
ch 'mk/make-rm-d
e
pdirs-c
o
uld-
b
e-empty'
commit
|
commitdiff
|
tree
2013-02-15
Junio
C
Hamano
Merg
e
br
a
nch 'mm/c
o
nfig-local-completion'
commit
|
commitdiff
|
tree
2013-02-15
Junio C
H
amano
Mer
g
e
b
r
anch 'ef/non
-
asci
i
-pa
r
se
-
optio
n
s
-error-di
a
g'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Merg
e
branch 'mk/old-expat'
commit
|
commitdiff
|
tree
2013-02-15
J
unio
C Hamano
Mer
g
e branc
h
'da/p4m
e
rge-
m
ktem
p
-
f
i
x'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hamano
D
ocumentati
o
n/git
-
add: kill remaining
<fi
l
epat
t
ern>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-14
W
.
T
r
evor King
user-
m
anua
l
: Update for receive
.
deny
C
urrentBranch=refuse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hamano
Up
d
a
te dra
f
t r
e
lease
notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next