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
merge-one-file: force content conflict for "both sides added" case
2013-03-25
Junio C Hama
n
o
merg
e
-one-f
i
le: force
content
conf
l
ict f
o
r "b
o
th sides
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
gi
t
-merge-one-f
i
le: sen
d
"
ERROR:" mess
a
ges
to st
d
err
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git-merge-one-fi
l
e: style cl
e
anup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-25
Junio
C
Ham
a
n
o
merge-one
-
file:
r
emove stale comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Brac
e
y
merge
t
oo
l
s/p4merge: creat
e
a base
if none available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
me
r
get
o
o
l
s/p4merge: swap LOC
A
L
a
nd RE
M
OTE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-09
Junio C Hamano
Merg
e
b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2013-03-09
Antoi
n
e Pelisse
perf:
update documentation of G
I
T_
P
ERF_
R
EPEAT_COUN
T
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-08
Junio C Ha
m
a
no
M
erge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2013-03-08
Junio C Hamano
Update draft release
n
o
t
es to
1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-07
Junio C Ha
m
ano
Git 1
.
8
.
2-
r
c3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-07
Junio C Ham
a
no
Merge git://
g
ithub
.
c
o
m
/
g
it-l10n/git-
p
o
commit
|
commitdiff
|
tree
2013-03-07
Ju
n
i
o
C Hamano
Merg
e
branch 'mp/complete-paths'
commit
|
commitdiff
|
tree
2013-03-07
Junio C
Ha
m
ano
M
e
rge
branch
'
m
aint'
commit
|
commitdiff
|
tree
2013-03-07
J
u
n
io C Hamano
Merge
b
r
a
nch 'mh/maint-cei
l
-
absol
u
te
'
into maint
commit
|
commitdiff
|
tree
2013-03-07
Fredrik Gustafsson
git
w
eb/README: remove reference
t
o
g
it
.
kernel
.
org
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-05
Matthieu Moy
git-completion
.
z
s
h: def
i
n
e
__gitco
m
p_fi
l
e co
m
patibility
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-04
J
unio C Haman
o
Merge git://github
.
com
/
gi
t
-
l
10n/git-
p
o
commit
|
commitdiff
|
tree
2013-03-03
Junio C Hamano
Gi
t
1
.
8
.
2
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Junio
C Hamano
S
ync w
i
th 1
.
8
.
1
.
5
commit
|
commitdiff
|
tree
2013-03-01
Junio C H
a
mano
G
i
t 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Thomas
R
ast
Make
!pattern in
.
gitattr
i
b
u
t
es
n
on-fatal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Junio C Ham
a
no
Me
r
ge b
r
anch 'w
k
/u
s
er-manual' into
maint
commit
|
commitdiff
|
tree
2013-03-01
Andrew Wong
D
o
c
ument
a
tion/githo
o
k
s: Fix linkgit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
M
erge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2013-02-27
Jun
i
o
C Haman
o
Upda
t
e draft release notes to 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-27
Junio C
Ha
m
a
no
Me
r
ge branch 'ef/non-asc
i
i-par
s
e-options-er
r
or-diag
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
M
e
rge bra
n
ch
'w
k
/m
a
n-
d
eny-curren
t
-branch-
i
s-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio C
H
amano
Merge branch 'jn/less-reconfig
u
re'
in
t
o maint
commit
|
commitdiff
|
tree
2013-02-27
Ju
n
io C Hamano
Merge
b
r
an
c
h 'mh/m
a
int-
c
ei
l
-abs
o
lut
e
'
commit
|
commitdiff
|
tree
2013-02-27
Brad King
D
o
cumentati
o
n/submodule: Ad
d
-
-
force to
up
d
a
t
e
s
ynop
s
is
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-26
J
unio C Ha
m
ano
M
e
r
g
e branch 'for-ju
n
io' o
f
git://gi
t
hub
.
com/kusm
a
/git
commit
|
commitdiff
|
tree
2013-02-26
Erik Faye-Lund
Rever
t
"
compat:
a
dd str
t
ok_r()"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio
C Hamano
Git 1
.
8
.
2-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge
git://gi
t
hub
.
com/git-l10
n
/git-po
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Ham
a
no
Sync with 'm
a
int'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio C Haman
o
Merge bran
c
h 'wk/u
s
e
r-manual'
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Merge b
r
anch 'jn/less-r
e
co
n
fi
g
ure'
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch
'
as/check-
i
gnore'
commit
|
commitdiff
|
tree
2013-02-25
Junio C
Hamano
Merge branch 'ct/autoconf-htmldir'
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o C
Hamano
M
erg
e
bra
n
ch 'wk/man-deny-
c
ur
r
en
t
-bran
c
h-is-defa
u
lt
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C
Haman
o
Prepare for 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
M
erge
br
a
nch
'jc/mention-tracki
n
g-for-pull-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch 'mm/c
o
nfi
g
-intro-in-git-do
c
' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
J
un
i
o C Hamano
Merge branc
h
'da/p4merge-
m
kte
m
p-
f
i
x'
into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Ha
m
ano
Merg
e
branch '
b
w/get-tz-offset
-
p
erl' into maint
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o C
Hamano
Merge branch 'a
l
/mergetool-
p
rin
t
f-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
M
erge branch 'jx/utf8-pr
i
ntf-width' into
m
ain
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch 'mg/bisect-
d
oc' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
Me
r
ge branch
'
sp/smar
t
-htt
p
-c
o
ntent-type-check' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch 'jc/combine-
d
i
ff-many-par
e
nt
s
' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
no
Merge
b
ranch 'jk/apply-sim
i
larit
l
y-parsing'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C Haman
o
Merge branch
'jk/remote-help
e
rs-do
c
' i
n
to maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C
H
amano
Merge b
r
anch 'ab/gitweb-use-same-scheme' in
t
o maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Mer
g
e branch
'
zk
/
clean-report-fail
u
r
e
'
into m
a
int
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C
H
ama
n
o
Merge b
r
anch 'nd/clone-no-separat
e
-git-dir-with-bare
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
no
M
e
rge b
r
anch 'da/p4m
e
rge-mktemp' into m
a
int
commit
|
commitdiff
|
tree
2013-02-25
Greg
P
r
ice
D
ocum
e
n
tation
:
"advice" is unco
u
ntable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-22
M
i
chael H
a
ggerty
Prov
i
de a m
e
chan
i
sm to turn off
symlink
r
esolutio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-21
Jeff King
Makefi
l
e
:
avoi
d
infinite
loop
on c
o
nfigure
.
ac change
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Junio
C
Haman
o
Sync wi
t
h
v
1
.
8
.
1
.
4
commit
|
commitdiff
|
tree
2013-02-20
Junio C Ha
m
ano
Git 1
.
8
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Junio C
H
am
a
no
M
erge branch 'ob/imap-se
n
d-ssl-verify'
i
nto maint
commit
|
commitdiff
|
tree
2013-02-20
Osw
a
ld Buddenha
g
en
imap-s
e
nd: suppo
r
t s
u
bjectAltName
a
s
w
ell
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Oswald Buddenh
a
gen
imap-sen
d
: th
e
su
b
ject of SSL
c
ertificate must m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
Jiang
X
in
Bugfix: undefined h
t
mldir in config
.
mak
.
a
u
togen
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
Juni
o
C Hamano
name-has
h
: all
o
w has
h
i
ng an
e
mpty s
t
ring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
use
r
-manual: F
l
esh out uncommitted changes and submod
u
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
T
r
evor King
user-manual: Use request-pull to
g
en
e
rate
"
p
l
e
ase pu
l
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
use
r
-m
a
n
ual: Re
o
rgan
i
ze th
e
r
e
roll sec
t
ions, adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
A
d
am S
p
iers
t00
0
8: d
o
cument test_expect_success_multi
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
Junio C Hamano
i
map-send: mo
v
e
#
ifd
e
f ar
o
und
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
Ju
n
io C Hamano
Merge br
a
nch 'j
c
/mention-tr
a
cking-fo
r
-pull-default'
commit
|
commitdiff
|
tree
2013-02-19
Junio C Hamano
M
e
rge bran
c
h '
m
m/confi
g
-int
r
o-in-g
i
t-doc'
commit
|
commitdiff
|
tree
2013-02-18
J
u
ni
o
C
H
ama
n
o
RelNotes 1
.
8
.
2: push-sim
p
le wil
l
not be in
e
ffect in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
Marti
n
Erik Werner
sh
e
l
l-pr
o
m
p
t: clean
up ne
s
t
ed if-then
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
Junio C Hamano
us
e
r
-manua
l
: typ
o
f
ix (ofth
e
->of the)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor K
i
ng
user-manual: use -
o
latest
.
tar
.
gz
t
o
create a
gzippe
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
T
r
evor King
user-manual: use 'gi
t
confi
g
--globa
l
user
.
*' f
o
r setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevo
r
King
user-manual: m
e
n
t
ion 'git remote
a
dd' for remote bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Tre
v
o
r
King
u
s
e
r
-
manua
l
:
g
ive 'git push
-f' as an alterna
t
ive
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor Ki
n
g
user-m
a
nual: use 'r
e
mote a
d
d' to setup push URLs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
Junio C H
a
ma
n
o
Merge git
:
/
/
g
ithub
.
com/git-l10n/g
i
t-po
commit
|
commitdiff
|
tree
2013-02-17
Junio C Ha
m
an
o
Git 1
.
8
.
2-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-17
Jun
i
o C Hamano
Merge b
r
anch 'jc/hidden-refs'
commit
|
commitdiff
|
tree
2013-02-17
Junio C
Hamano
Merg
e
branch 'mp/di
f
f-a
l
go-config'
commit
|
commitdiff
|
tree
2013-02-17
Junio C Hamano
Merge branch '
m
w/bash-p
r
ompt-show-untracke
d
-con
f
i
g
'
commit
|
commitdiff
|
tree
2013-02-17
Ju
n
io
C
Ha
m
ano
M
erge branch 'jk/rebase-i-comm
e
nt-char'
commit
|
commitdiff
|
tree
2013-02-17
Ju
n
io C
H
ama
n
o
Merge bran
c
h 'jk/
r
ead-commit-buf
f
e
r
-data-aft
e
r-fr
e
e'
commit
|
commitdiff
|
tree
2013-02-15
Junio C H
a
man
o
Updat
e
dra
f
t release notes t
o
1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-15
Matthieu
M
oy
git
.
txt: up
d
ate descr
i
p
tion of the configuration mech
a
ni
s
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-15
J
unio C Hamano
Merge branch
'wk/man-d
e
ny-current-branch-is-def
a
ult
.
.
.
commit
|
commitdiff
|
tree
2013-02-15
Junio C
H
a
mano
Mer
g
e
branch 'mk/make-rm-d
e
pdirs-could-be-empty'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Me
r
ge
branch '
m
m
/config-local
-
c
o
mpletion
'
commit
|
commitdiff
|
tree
2013-02-15
Ju
n
io C H
a
mano
Merge branch 'ef/
n
on-ascii-parse-options
-
error
-
d
i
ag'
commit
|
commitdiff
|
tree
2013-02-15
Ju
n
i
o
C Hamano
Merge branc
h
'
m
k/old
-
exp
a
t'
commit
|
commitdiff
|
tree
2013-02-15
J
u
n
i
o C
H
a
mano
Me
r
ge branch 'da/p4merg
e
-mk
t
emp-f
i
x'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Ham
a
no
D
ocumentat
i
on/
g
i
t
-add: kill rem
a
ini
n
g
<
filepa
t
t
er
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-14
W
.
T
r
e
vor Kin
g
use
r
-manual:
Update f
o
r receive
.
denyCu
r
rentBranch=ref
u
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next