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
t5521: test --dry-run does not make any changes
2015-05-29
Paul Tan
t5
5
21: test --dr
y
-run does n
o
t make
any changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
0
: tes
t
--rebase fail
u
re
o
n unborn branch with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t
5520: test --rebase with m
u
ltiple branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20: test
w
ork tree
fast-forward when fetch update
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520
:
test for failure if index has u
n
re
s
olved entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
aul Tan
t5520: tes
t
no merge candidates cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
aul Tan
t5
5
20: prev
e
nt field sp
l
i
tting in
content compari
s
on
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: deprecate
'
g
it merg
e
<mes
s
ag
e
>
HEAD <co
m
mit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: h
a
ndle FETCH_HEA
D
internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
m
erge: decide if we
aut
o
-
g
enerate the message ea
r
ly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C
Ha
m
a
n
o
merge:
make
c
ol
l
ect_
p
arent
s
(
) auto-generate th
e
merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C H
a
mano
m
e
r
g
e: extract prepare_merge_mess
a
ge() logi
c
ou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C
H
a
mano
merge: narrow sco
p
e
of me
r
ge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: split re
d
uce_parents() out of collect_
p
a
rents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: clari
f
y collect_p
a
r
ent
s
(
) lo
g
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: small leakfix and code simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: d
o
not
c
he
c
k ar
g
c to determine number of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Ha
m
ano
m
e
r
ge: clarify "
p
u
l
ling i
n
t
o
voi
d
" special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Haman
o
t552
0
: test pulling an octopus into an u
n
born br
a
nch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
m
ano
t5520: style fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: simplify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: te
s
t
t
he top
-
l
evel me
r
ge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
unio C H
a
m
a
no
Git 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
M
e
rge branch 'jk/read-packed-r
e
fs-without
-
path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge bran
c
h 'm
g
/a
d
d-igno
r
e-errors' i
n
to main
t
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch 'mh/f
i
nd-uniq-abb
r
ev
'
into
maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ha
m
ano
Merge bran
c
h
'jk/ap
p
ro
x
idate
-
av
o
id-
y
-d-m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C Hamano
Merge bran
c
h 'rw/apply-does-not-take
-
ignore-d
a
te' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C
Ha
m
ano
Merge branch 'jk/for-each-r
e
flog-ent
-
rever
s
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge branch 'maint-2
.
1' int
o
maint
commit
|
commitdiff
|
tree
2015-01-07
Junio
C Hamano
Mer
g
e
bra
n
ch 'maint-2
.
0' into
m
a
int-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
amano
M
e
rge branch 'ma
i
nt-1
.
9' into
m
a
int-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Hamano
Mer
g
e br
a
nch 'maint-1
.
8
.
5' in
t
o ma
i
nt
-
1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Ha
m
ano
M
e
rge branch 'jk/dotg
i
t-case-
m
aint-
1
.
8
.
5' into maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
i
s
_
hfs_dotgi
t
: loosen ove
r
-eager mat
c
h of \u{
.
.
47}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
i
o C Hamano
Prepare for 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
Merge
b
ranch '
j
k/rebuild-perl-scripts
-
w
i
th-no
-
p
e
rl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C
H
a
ma
n
o
Merge
b
ranch 'j
k
/no-
p
erl-tests
'
in
t
o
m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
a
mano
Merge branch
'
po/eve
r
yday-doc' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge
branch 'jk/pu
s
h-simple
'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C H
a
mano
Merge br
a
nch 'mh/config-
f
lip-xbit-b
a
ck-after-
c
hecking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
a
n
o
Merge br
a
n
c
h
'jk/gitweb-with
-
newe
r
-c
g
i-
m
ult
i
-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Merge b
r
anch
'rs/recei
v
e-pack-use-labs
'
into
m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge br
a
nc
h
'
rs/maint-config-use-lab
s
' into
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Merge
b
ran
c
h
'
js/windows-o
p
en-eisdir-error' into
m
ai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o
C
Hamano
Merge br
a
nch
'jk/
c
olors-
f
i
x
' i
n
to maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
n
o
M
e
r
ge branch 'jk/checkout
-
f
r
om-tr
e
e' in
t
o
maint
commit
|
commitdiff
|
tree
2014-12-22
Ale
x
ander
Kuleshov
clean:
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
Git
2
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio
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
J
u
nio C Haman
o
S
yn
c
w
ith v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
unio C
Hamano
Git 2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C Hamano
Sync wit
h
v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git
1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ham
a
no
Sync with v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
mano
Git
1
.
8
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ha
m
a
n
o
Merge branch 'd
o
tgit-
c
ase-maint-1
.
8
.
5
'
into maint
-
1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schin
d
elin
fsck: compl
a
in about
N
T
FS "
.
git" al
i
as
e
s
i
n
tr
e
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schinde
l
in
r
ead
-
cache: option
a
lly
d
isal
l
ow NT
F
S
.
g
it vari
a
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Joha
n
nes Schindelin
pa
t
h: add is_ntfs_
d
otgit() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck: compl
a
i
n
about
H
FS+ "
.
git" aliases in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Ki
n
g
read-cache: op
t
ionally disallow HFS+
.
git
v
a
ria
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
eff King
utf8: add is_
h
fs_d
o
tg
i
t()
helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
f
s
ck: notice
.
git case-insensit
i
vely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t14
5
0
: ref
a
c
tor
"
.
", "
.
.
", and "
.
git"
f
sck tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f King
v
erify_d
o
t
file(): re
j
ect
.
git case-insens
i
tively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
r
ead-
t
ree: add
tests for conf
u
sing path
s
like "
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff K
i
ng
unpack-trees
:
pr
o
pagate error
s
adding entries
t
o th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Je
f
f K
i
ng
read_packed_refs: use
skip_prefix i
n
stead of static
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff Kin
g
r
e
ad_p
a
cked_
r
e
fs: pass strbuf to parse
_
ref_
l
ine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed_refs: use a st
r
buf for readi
n
g lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ron
a
l
d W
a
m
p
ler
git
-
am
.
txt: --i
g
nore-date
f
lag is not passed to g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Juni
o
C Haman
o
Merge bran
c
h 'maint' of git://git
h
ub
.
com/git-l10n/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C
Ham
a
n
o
Start po
s
t 2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
J
eff K
i
ng
f
or_
e
ach_r
e
flog_ent_rev
e
rse: turn leftover check int
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff
K
i
ng
for_e
a
ch_refl
o
g_
e
nt_revers
e
: fi
x
ne
w
lines
o
n
block
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jeff Kin
g
p
ush: truly use "si
m
ple" a
s
de
f
ault, not "
u
p
s
t
ream"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
J
u
nio C Hama
n
o
Git 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Marc Branchaud
RelNo
t
e
s
: spellin
g
& grammar t
w
eaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike Hommey
s
ha1_name:
a
void unnecessary sha1
look
u
p in find_unique_ab
b
rev
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
Mic
h
ae
l
J
G
ru
b
er
add
:
i
g
nore only ig
n
or
e
d files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff
Ki
n
g
t4026: tes
t
"norm
a
l
" colo
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
config: fix pars
i
ng
of "git confi
g
--get-
c
ol
o
r s
o
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff Ki
n
g
do
c
s
: descri
b
e ANSI 256-c
o
lo
r
mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio
C H
a
mano
Merge branch 'sv/submitting-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Me
r
ge br
a
nch 'sn/tutorial-stat
u
s
-output-example'
commit
|
commitdiff
|
tree
2014-11-19
Juni
o
C Hamano
Merge bra
n
ch 'mh/doc-re
m
ote-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch 'tb/no-relative-fil
e
-url'
commit
|
commitdiff
|
tree
2014-11-19
J
u
n
i
o
C
Hamano
Merge b
r
an
c
h 'cc/
i
nter
p
ret-trail
e
rs'
commit
|
commitdiff
|
tree
2014-11-18
Jeff
King
gitw
e
b: hack arou
n
d CGI's
l
ist-
c
ont
e
xt p
a
ram(
)
ha
n
dling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan
N
ieder
Makefile
:
have python scripts
d
epend on N
O
_PYTHO
N
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nied
e
r
Makefile: simplify b
y
u
sing SCRIPT_{PERL,
S
H}_GEN macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hama
n
o
M
erge git://github
.
com/git
-
l1
0
n
/
git-po
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C Ham
a
no
Merge
br
a
nch 'jc/doc-commit-only'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge bra
n
ch 'ta/tutorial
-
moderni
z
e'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hama
n
o
M
erge branch 'da
/
difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jef
f
King
t
9
6
0[34]: mark cvsimport tests as req
u
iring pe
r
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Je
f
f
Kin
g
t0090: m
a
rk a
d
d-
i
n
teractive
t
est wit
h
PERL prerequi
s
i
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next