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: depreca
t
e 'git me
r
ge <message> HEAD
<
c
o
mmi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
handle FETCH_HEAD internall
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C Hamano
merge: de
c
i
de if we auto-generate the
m
ess
a
g
e
e
arly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge: make
c
ollect
_
par
e
nt
s
()
auto-generate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
m
er
g
e: extract
p
repare_merge_message() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
g
e
: narrow
s
cope of
m
erge_
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
split reduc
e
_parent
s
() out of c
o
llect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: clarify collect_pa
r
ents()
l
o
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge:
s
mall l
e
akfix and code
s
im
p
l
i
f
ication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Ha
m
ano
merge: do not check argc to determine n
u
mber of r
e
mo
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge:
c
l
arify "pull
i
ng into void"
s
pecial
c
as
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Ham
a
no
t5
5
20
:
test
p
ulling an octopu
s
into an unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
t5520: st
y
le fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Ham
a
no
merge: simplify code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge:
t
es
t
the top-lev
e
l
m
erge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
a
mano
G
i
t 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merg
e
b
ranc
h
'jk/read-packed
-
refs-without-
p
ath-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Haman
o
Mer
g
e bra
n
ch 'mg/add-ignore-
e
rrors' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Hamano
M
e
r
ge branch 'mh/find-uniq-abbre
v
'
into maint
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Hamano
Merge branch
'jk/ap
p
rox
i
date-avoid-y-d
-
m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Hamano
Mer
g
e b
r
anc
h
'
rw/apply-does-not-take-ignore
-
date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch 'jk/for-eac
h
-re
f
log-ent
-
reverse'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C Ha
m
a
no
Merge branch 'ma
i
nt-
2
.
1
' into ma
i
nt
commit
|
commitdiff
|
tree
2015-01-07
J
unio C Ha
m
a
n
o
Merge branch 'maint-2
.
0' into main
t
-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge b
r
anch 'maint-1
.
9' into
maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C H
a
mano
Merge branch 'maint-1
.
8
.
5'
into
maint
-
1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge
b
r
anch 'jk/dotgit
-
c
ase-maint-1
.
8
.
5' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
J
e
ff King
i
s
_
h
f
s_dotgit: loosen ov
e
r-eage
r
match o
f
\u{
.
.
47}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Pr
e
par
e
for 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
amano
Merge branch '
j
k/rebuild-pe
r
l-scripts-
w
ith-no-
p
e
r
l
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Merge branch 'jk/no-perl-test
s
' into
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
ama
n
o
Me
r
ge branc
h
'p
o
/
everyda
y
-doc' into
maint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Haman
o
Mer
g
e bran
c
h
'
jk/pus
h
-
s
imple'
i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch
'mh/config-flip-xbit-back-after
-
checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Haman
o
Merge branch 'jk/g
i
tweb-with-n
e
w
er-cg
i
-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io
C
Hamano
Merge br
a
nch 'r
s
/receive-
p
ack-use-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio
C
H
amano
Merge br
a
nch 'rs/maint-config-use-la
b
s' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch
'
js/wi
n
dows-open-
e
isdir-er
r
or
'
into
m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Merge b
r
anch 'jk/col
o
rs-
f
i
x
' in
t
o
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge
branch 'jk/c
h
eckout-from-tree' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Alexander Kuleshov
cle
a
n: typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
u
ni
o
C H
a
m
a
no
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
Ju
n
io C Hamano
Git 2
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
Hamano
Sy
n
c with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio
C Ham
a
n
o
Git 2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
Sync with v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C
H
a
m
ano
G
it
1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sy
n
c with v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o 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 Hamano
Merge
b
r
a
n
ch 'dotgit-case-maint
-
1
.
8
.
5' into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johan
n
es Sc
h
inde
l
in
fsck: co
m
plain about NTF
S
"
.
git" aliases in t
r
ees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johan
n
es Schindelin
r
e
ad-cache: o
p
tion
a
lly
disa
l
low
NTFS
.
git variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
p
a
th:
add is_ntfs_dotgit() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
f
f K
i
ng
f
s
ck: co
m
pl
a
in abo
u
t HFS+ "
.
git" alias
e
s
in trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-cache: op
t
ionally
d
isallow HFS+
.
git va
r
ia
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
King
utf8: ad
d
is_hfs_dotgit
(
) helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
i
ng
fsck: notice
.
git case-ins
e
nsitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Ki
n
g
t1450: re
f
acto
r
"
.
", "
.
.
", and "
.
git" fsck tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
King
verify_
d
otfile(
)
:
re
j
ec
t
.
git case-i
n
sensitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
r
ea
d
-tree: add tests for confusing paths like "
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
i
n
g
u
n
pack-
t
rees:
pr
o
pagate errors adding ent
r
ies to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
J
eff King
re
a
d_p
a
ck
e
d
_
refs: us
e
s
kip_pre
f
i
x
ins
t
ead of static
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jef
f
King
read_packed_refs: pass strbuf to parse_ref_line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
J
eff King
read_p
a
cked_r
e
fs:
use a strbuf
f
or re
a
ding lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wampler
git-am
.
txt: -
-
ig
n
o
re-date fla
g
is not
p
assed to g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
J
unio C
H
amano
Me
r
ge branch 'maint' of git://
g
ithub
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Start pos
t
2
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
f
or_each_reflog_ent_re
v
e
r
s
e
:
turn le
f
tover check into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
fo
r
_each_reflog_ent_reverse:
f
i
x newlines on block
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
Jeff K
i
ng
p
ush: truly use "simple" as
d
efault, not
"ups
t
ream"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Junio C
H
amano
Git 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Marc
B
r
a
nchaud
RelNotes: spellin
g
& gra
m
m
a
r tweaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mike H
o
mmey
s
ha1_name: avo
i
d unn
e
cessary sha1
lookup in find_unique_abbrev
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Jun
i
o C Ha
m
ano
Git 2
.
2
.
0
-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Mi
c
hael J Grube
r
add: ignore onl
y
ignored
file
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
t4026
:
test "nor
m
a
l
" color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Je
f
f King
co
n
fig: f
i
x par
s
i
n
g
o
f "git config
-
-ge
t
-color some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jef
f
King
docs: descri
b
e
A
NS
I
256-
c
olor mo
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch 'sv/su
b
mitti
n
g-f
i
nal-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
M
erge br
a
nch 'sn
/
tutorial-st
a
tus-output-e
x
ample'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Me
r
ge branch 'mh/
d
oc-remot
e
-helper-
x
ref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C H
a
mano
M
e
rge bran
c
h
'tb/no-
r
ela
t
ive-fil
e
-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C Hama
n
o
Merge b
r
anch 'cc/in
t
erpret
-
t
railers'
commit
|
commitdiff
|
tree
2014-11-18
Jef
f
King
gi
t
web:
h
ack around
CGI'
s
list-co
n
text para
m
() handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
J
o
n
ath
a
n
N
ieder
Makefile: have pyt
h
on scripts depend on NO_P
Y
THON
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jo
n
a
t
ha
n
Nieder
Makefile: simplify by using SCRIPT_{
P
ERL,SH
}
_
GEN macro
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C Ham
a
n
o
Merge git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
Junio
C
H
amano
M
erg
e
bra
n
c
h
'jc/doc-
c
ommit-
o
nly'
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C Hamano
Merge branch 'ta/tutoria
l
-moderni
z
e'
commit
|
commitdiff
|
tree
2014-11-18
J
uni
o
C
Hamano
Merge
b
r
a
nch 'da/difftool
'
commit
|
commitdiff
|
tree
2014-11-18
Jeff Kin
g
t960
[
34
]
: mark cvsim
p
ort test
s
as
r
equiring perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Je
f
f King
t0090: mar
k
add-interacti
v
e test wi
t
h PERL prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
Makefile: have
perl script
s
dep
e
nd on NO_PERL setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Michael Haggerty
create_default_files(
)
: don't
set u+x bit on
$
GIT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
Junio C Hamano
M
erge branch 'master' of git:/
/
github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
bri
a
n m
.
carl
s
o
n
Documentation: change "gitlink" typ
o
in git-push
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
René S
c
harfe
use
l
ab
s
() f
o
r variables of type lo
n
g instead of abs(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
Re
n
é
Scharfe
use labs() for variables of type lon
g
ins
t
ead of ab
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
Johan
n
es S
i
x
t
Windows: correct detection of
E
ISD
I
R
i
n mingw_open()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next