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
t5520: check reflog action in fast-forward merge
2015-05-29
Paul
T
an
t55
2
0: check reflog actio
n
i
n
f
ast-
f
orward merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5521:
test --dry-run
d
oes n
o
t make any
c
han
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test --
r
ebase failure on u
n
born bra
n
ch
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t
5
520: test --r
e
base
w
ith multi
p
le branc
h
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5520: test work tr
e
e fast-fo
r
ward when
f
e
t
c
h up
d
a
t
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520: tes
t
for fail
u
re if
i
ndex has unres
o
lve
d
entr
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t
5
520: test
no merge candidates
c
ases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul T
a
n
t5520
:
prevent field spli
t
ti
n
g in c
o
ntent comparisons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: dep
r
ecate 'git merge <message> HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C Ham
a
no
mer
g
e: handle FETCH_HEAD i
n
ternally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge:
d
e
ci
d
e
i
f we
a
uto-gene
r
ate the mes
s
a
ge early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ham
a
no
me
r
ge
:
m
a
ke
collect_pa
r
en
t
s() auto-generate th
e
m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
Hamano
merg
e
:
e
x
t
ract pr
e
pare_merge
_
me
s
sage() lo
g
ic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
m
erge: narr
o
w scope
of mer
g
e
_
nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: split red
u
c
e
_p
a
rents() out of collect_par
e
n
t
s
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: clarify collect_pare
n
ts() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge
:
s
m
a
l
l leakfix a
n
d code simplification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Ha
m
ano
mer
g
e
: do not check argc to d
e
t
e
rmine
n
umber of
r
emot
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Haman
o
merge: clarify "pulling into void" special cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5520: te
s
t pull
i
ng an o
c
topus into an unborn br
a
nc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
uni
o
C
H
aman
o
t5520
:
s
tyle fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hama
n
o
merg
e
: simplify
code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o
C Ha
m
ano
m
e
rg
e
: test t
h
e
top-level merge
d
river
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ha
m
ano
Git 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Hamano
Merge branch
'
jk/re
a
d-packed
-
refs-without-pa
t
h-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C
H
amano
Merge bran
c
h
'
mg/add-ignore-errors' into maint
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Ham
a
no
Merg
e
branch 'mh/find
-
u
n
iq-abbrev'
int
o
m
aint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch
'
jk/a
p
proxidat
e
-avoid
-
y-d-m-over-futur
e
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ha
m
a
no
Merge
b
ranch 'rw/apply-does
-
not-take-i
g
nore-
d
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Haman
o
Merge br
a
nch 'jk/for-each
-
r
e
flog-ent-reve
r
se' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merg
e
bra
n
ch 'maint
-
2
.
1' into maint
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Hamano
Merge branch 'maint-2
.
0'
into maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Ju
n
io C Hamano
Merge branch 'm
a
int-1
.
9' into
maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio
C Haman
o
Merge branch '
m
aint-1
.
8
.
5'
i
nto ma
i
nt-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio
C
H
ama
n
o
M
e
rge bra
n
ch 'jk/do
t
git-ca
s
e-maint-1
.
8
.
5
'
in
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff Ki
n
g
i
s_hfs
_
dotgi
t
: loosen over-eag
e
r match of \u
{
.
.
47}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
J
u
ni
o
C Hama
n
o
Prepa
r
e for 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hamano
Merge branc
h
'
j
k/re
b
uild-perl
-
scr
i
pts-
w
ith-n
o
-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C
H
amano
Merge b
r
anch
'
j
k
/
n
o
-perl-
t
ests' in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Merge branch 'po/everyda
y
-doc' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Ha
m
ano
Merg
e
branch 'jk/push-s
i
mp
l
e' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
erge branch 'mh/config-flip-xb
i
t
-back-a
f
ter-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
aman
o
Merg
e
b
ranch 'j
k
/gitw
e
b-with-newer-cgi-multi
-
param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
amano
Merge branch 'rs/rece
i
ve-pack-use-labs' in
t
o main
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
Me
r
g
e
br
a
nch
'rs/maint
-
config
-
use-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
M
e
rge
b
r
a
nch 'js/wi
n
dows-open-eisdir-error' int
o
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/colors-fix'
into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
er
g
e
branch
'
j
k/chec
k
out-fr
o
m
-
tree' i
n
to maint
commit
|
commitdiff
|
tree
2014-12-22
Alexander Kul
e
s
hov
clean: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git 2
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
unio C Hamano
Sync
with v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git 2
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
S
y
nc
w
ith v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
unio
C
H
amano
G
it 2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C Haman
o
Sync w
i
t
h
v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
Hama
n
o
Git
1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
mano
Sync with v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ha
m
a
no
Gi
t
1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C Hamano
Merge branch
'
d
o
tgi
t
-case-
m
aint-1
.
8
.
5
'
i
n
to maint-
1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
f
s
ck: co
m
pl
a
in about NTFS "
.
git" al
i
ases in tre
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
rea
d
-cache: optionally disall
o
w
NTFS
.
g
it variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
ohannes Schin
d
eli
n
path: add is_n
t
fs_
d
otgi
t
() h
e
lper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck: complain
a
bout HF
S
+
"
.
git" aliases in
t
rees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Ki
n
g
read
-
c
a
c
he: optionally disallow HFS+
.
git
v
ariants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f K
i
ng
utf8: add
is_hfs_dotg
i
t
(
) helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff Ki
n
g
f
s
ck:
notice
.
g
i
t case-inse
n
sitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Kin
g
t
1
450
:
r
e
factor "
.
", "
.
.
",
a
nd "
.
git" f
s
ck tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
King
verify_d
o
tfile():
rejec
t
.
g
i
t cas
e
-insen
s
itively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff Kin
g
read
-
tree: add tests f
o
r
c
onfusing paths
l
ike "
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
unpack-
t
rees:
p
ropagate errors
a
d
ding entries
t
o
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff Kin
g
read_packed_refs: use s
k
ip_
p
refix in
s
tead of s
t
atic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
J
e
ff K
i
ng
r
ead_packe
d
_refs: pass
strbuf to p
a
rse_ref_lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Je
f
f
King
read_packed_ref
s
: us
e
a st
r
buf for
re
a
ding lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Rona
l
d Wamp
l
er
git
-
a
m
.
t
x
t: --ignore-date flag is not
passed to g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
J
unio C Ham
a
no
Me
r
ge bra
n
ch 'maint' of git://github
.
com/git-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
J
un
i
o
C
Ha
m
ano
Start post 2
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_reflog_ent_reverse: tu
r
n l
e
ft
o
ver c
h
eck into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_re
f
l
o
g_ent_reverse: fix newlines on bloc
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
J
eff Kin
g
p
us
h
: truly
use "s
i
mple" as d
e
fa
u
l
t
, not "upstre
a
m"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Juni
o
C
H
amano
Git 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
M
arc B
r
a
nchaud
RelNotes: spelling & gramma
r
tweaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mike Hom
m
ey
sha1
_
name: avoid unnecessary sh
a
1
lookup in f
i
nd_uniq
u
e_ab
b
re
v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Hamano
Git 2
.
2
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Michael J Gru
b
er
add
:
ign
o
re onl
y
ignored fi
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
J
e
f
f King
t4026: test "normal" color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
J
eff
K
ing
config
:
f
ix parsin
g
of "git config --get-colo
r
some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
d
ocs: describe ANS
I
256-color mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o
C
Hamano
Merge bra
n
ch 'sv/
s
u
b
mitting-fi
n
al-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge
branch '
s
n/tutorial-status-out
p
ut
-
example'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o
C Hamano
Merge branch 'mh/d
o
c-remot
e
-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Juni
o
C Haman
o
Mer
g
e
bra
n
ch '
t
b/no-relative-file-u
r
l'
commit
|
commitdiff
|
tree
2014-11-19
J
un
i
o C Ha
m
ano
Merge bran
c
h
'
c
c/interpr
e
t-trailers'
commit
|
commitdiff
|
tree
2014-11-18
J
ef
f
K
i
ng
gitwe
b
: hack aroun
d
CGI's list
-
context p
a
ram()
h
andling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
J
o
nathan Nieder
Mak
e
f
i
le: ha
v
e
p
ytho
n
scr
i
p
t
s depend on NO
_
PYTHON s
e
t
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan N
i
eder
Makefile
:
simplify by using SCRIP
T
_{PERL,SH}_GEN
m
acros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merg
e
git://
g
i
th
u
b
.
c
o
m/g
i
t
-l10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
J
unio C Hamano
Merg
e
branch 'jc/doc-commit-only'
commit
|
commitdiff
|
tree
2014-11-18
J
unio C Hamano
Merge branch
'ta/tutorial-m
o
der
n
ize'
commit
|
commitdiff
|
tree
2014-11-18
Ju
n
io C
H
amano
M
e
r
g
e
branch 'da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t9
6
0[34]: mark
c
v
simport tes
t
s as requir
i
ng perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next