repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: deprecate 'git merge <message> HEAD <commit>' syntax
2015-04-29
Junio C Hamano
m
e
rge: de
p
recate 'git merge <messa
g
e
> HEAD <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: han
d
le FETCH_HEAD internall
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Ha
m
ano
m
e
rg
e
:
decide if w
e
auto-generat
e
th
e
message early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
mer
g
e
:
make col
l
ec
t
_parents() au
t
o-generate the
m
er
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: extract prepare_
m
erge_mes
s
age() logic o
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hama
n
o
merge
:
n
arrow
s
cope of merg
e
_
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merg
e
:
s
pl
i
t re
d
uce_parents() o
u
t of collect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: cla
r
i
f
y collect_paren
t
s(
)
l
ogic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merg
e
:
small leakf
i
x a
n
d co
d
e simpl
i
fi
c
ati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C H
a
mano
m
e
rge: do not check a
r
gc to det
e
r
m
i
ne number of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Ham
a
no
merge: c
l
arify "
p
ulling in
t
o void" special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
t5
5
20: t
e
st
p
ulling an octopu
s
into an unborn
b
r
anch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5
5
20: style fi
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
a
no
merge: simp
l
i
f
y cod
e
f
l
ow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: test
the top-level merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Git 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Haman
o
Merge bra
n
ch 'jk/r
e
a
d-packed-ref
s
-without-path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Merge branch 'mg/add-
i
gnore-errors' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Ha
m
ano
Merge
branch '
m
h/find-un
i
q
-abbre
v
' i
n
to maint
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o C Hamano
Merge br
a
nch 'jk/approxidat
e
-avoid-y-
d
-m-over
-
future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
M
erge bran
c
h
'
rw/a
p
ply-do
e
s
-
not-take-ignore-
d
ate' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
i
o
C Ha
m
a
no
Me
r
ge
b
ranch 'jk/for-e
a
ch-reflog-ent-r
e
verse' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge branch 'maint-2
.
1' into m
a
in
t
commit
|
commitdiff
|
tree
2015-01-07
Junio C
Hamano
Merge b
r
a
n
c
h
'maint-2
.
0' into
m
aint-
2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge branch 'maint-1
.
9' into maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ham
a
no
Merge branch
'
maint-1
.
8
.
5
'
into m
a
int-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C
H
amano
Merge branc
h
'jk/d
o
t
git-case
-
maint-1
.
8
.
5'
i
nto
maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is_hfs_
d
otgit
:
loosen
o
v
e
r
-ea
g
er
m
atch of \u{
.
.
47}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Hama
n
o
Prepar
e
f
o
r 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
e
rge bra
n
c
h
'
jk/rebuild
-
perl-scripts-
w
ith-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Merge
b
r
a
nc
h
'j
k
/no-perl-tests' int
o
m
a
int
commit
|
commitdiff
|
tree
2014-12-22
J
unio C
H
ama
n
o
Mer
g
e b
r
anch 'po
/
everyday-doc' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
e
r
g
e br
a
nch '
j
k/push-simple' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
Merge
b
ranc
h
'mh/confi
g
-flip-xbit-back-after-
c
hecking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
io C Ham
a
no
M
e
rge
b
ranch 'jk/gitweb-with-ne
w
e
r-cgi-multi-
p
aram
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
Merge branch
'rs/recei
v
e-pack-use-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Mer
g
e
b
r
an
c
h '
r
s/
m
aint-
c
onfig-use-l
a
bs' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Hamano
Me
r
ge branch 'j
s
/windows
-
open-eisdir-err
o
r'
into main
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk
/
colors-fix'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/checkout-from-tree' into
m
aint
commit
|
commitdiff
|
tree
2014-12-22
A
lexander Kulesho
v
clean: typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
unio
C
Hamano
Git 2
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C Hamano
Sync
w
i
th v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
G
i
t 2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
Ha
m
ano
S
ync with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
G
it 2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync with 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
H
amano
S
ync with v
1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
G
it
1
.
8
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C Hamano
Me
r
ge b
r
anch 'dotg
i
t
-c
a
s
e
-ma
i
nt-1
.
8
.
5'
i
n
to m
a
int-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Sch
i
ndelin
fsck: complain about NTFS "
.
git"
a
liases
in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
ohannes
Sch
i
ndelin
read-cache
:
optionally disallow NTF
S
.
git variant
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jo
h
an
n
es Schindelin
path
:
a
d
d
is_ntfs_dotgit()
helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
ing
fsck: complain about
H
F
S
+ "
.
g
it" aliases in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-cache: optionally disallow HFS+
.
git variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
utf8: add is_hf
s
_dot
g
it() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck:
n
otice
.
git cas
e
-insensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t
1
450: refact
o
r "
.
", "
.
.
", and
"
.
git" fs
c
k
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
Ki
n
g
verify_dotfile(
)
: re
j
ect
.
git case
-
insensitiv
e
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
eff
K
ing
read-tree: ad
d
tests fo
r
c
o
nfusin
g
p
a
t
hs like "
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff Kin
g
unpack-trees: propagate error
s
ad
d
in
g
entr
i
es to
t
he
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff K
i
ng
read_pac
k
ed_refs: use skip_
p
refix
instead o
f
static
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_pa
c
ked_refs:
pass strbuf t
o
parse_r
e
f_line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
r
e
ad_pac
k
e
d_refs: use a strbuf
f
or reading li
n
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wa
m
pler
git-am
.
txt: --ignore-date flag is
not p
a
ssed to git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Merge b
r
anch 'maint' of
g
it://github
.
com/git-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
J
u
nio C Hamano
Start post 2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff K
i
ng
for_ea
c
h
_r
e
flog_en
t
_re
v
erse: t
u
rn leftover check
i
nto
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_reflog_
e
nt_reverse: fix new
l
ines on bl
o
ck
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jeff King
pu
s
h
:
tru
l
y use "simpl
e
"
as default, no
t
"upstream"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Jun
i
o C Hamano
Git
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Marc Bra
n
chaud
RelNotes: spelling
&
g
ra
m
m
a
r tw
e
a
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike
H
o
m
mey
s
ha1_name: avoid unnecessary sha1
lookup in find_unique
_
a
b
brev
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Ham
a
no
Gi
t
2
.
2
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Michael J Gruber
add: ignore only ignored files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff Kin
g
t4026:
t
est "normal" color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
config: fix parsing
of
"git
c
o
nfig
--get-color s
o
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff
K
ing
docs: descri
b
e
A
NSI 25
6
-color mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge
b
ranch
'
sv/s
u
bmi
t
ting-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o
C
H
a
m
ano
Merge b
r
anch
'sn/tutorial-status-o
u
tput-exa
m
ple'
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C Hamano
M
erge branch 'mh/do
c
-remote-helper-x
r
ef'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
H
amano
Merge branch 'tb/no-relative-file-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Ha
m
ano
Me
r
ge
branch 'cc/inter
p
re
t
-
t
r
a
ilers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
gitweb:
ha
c
k around CGI
'
s list-
c
onte
x
t param() handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Niede
r
Makefile: have
pyt
h
on
s
cripts depend
on NO_PYTHO
N
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonath
a
n Nieder
Mak
e
fi
l
e: sim
p
lify
b
y using SCRIPT_{PERL,SH}_GEN macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C Hamano
Merge git://g
i
thub
.
com/gi
t
-
l
10
n
/git-po
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge branch 'jc/doc-commit-on
l
y'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Mer
g
e branch 'ta/tutor
i
al
-
mo
d
ernize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge
b
ranch
'da/dif
f
tool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff Kin
g
t
9
60[34]: mar
k
cvs
i
mpor
t
tests
as r
e
quiring p
e
r
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff K
i
ng
t
0
090: mark add-inter
a
ctive tes
t
w
i
th
PERL prer
e
q
uisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff Kin
g
Makefile: have p
e
rl
s
crip
t
s
depe
n
d on
N
O_PERL
settin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Michae
l
Haggerty
c
r
ea
t
e_
d
efault_f
i
les(): don't set u+x bit
o
n $G
I
T_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Junio C
Hamano
Merge br
a
nch 'mas
t
er' of git://git
h
ub
.
com
/
git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
bri
a
n
m
.
carlson
Docum
e
nt
a
tion:
change "
g
itlink"
t
y
p
o in gi
t
-pu
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Re
n
é Scharfe
use l
a
b
s
() for variab
l
e
s
of type long ins
t
e
ad
of a
b
s
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
René Scharfe
use labs() for
v
ariables of
t
yp
e
long inst
e
ad of abs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Johannes Si
x
t
Windows
:
c
o
rrect detect
i
on of EISDIR in mingw_open()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next