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
am -3: support 3way merge on unborn branch
2015-06-08
Pa
u
l Tan
am -3: support
3
w
ay
merg
e
on
unb
o
rn
branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
u
l
T
an
am --skip
:
revert changes introd
u
ced b
y
failed 3w
a
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Ham
a
no
Git 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C Hamano
Merge
branch 'jk/read-packed-refs-wi
t
hout-pat
h
-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
Merge b
r
anch
'mg/add-ignore-errors' into maint
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C H
a
m
ano
Merge branch
'mh/find-
u
niq-abbrev
'
int
o
maint
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Haman
o
Merge branc
h
'jk/
a
ppro
x
idate-avoid-y-d-m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branc
h
'
rw/apply-does-not-take-ig
n
o
r
e-dat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Hamano
Merge branch 'jk/fo
r
-each-
r
eflog-ent-reverse'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
a
m
a
n
o
Merg
e
bran
c
h 'mai
n
t-2
.
1
'
into main
t
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge branch 'maint-2
.
0' int
o
maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C Hama
n
o
Merg
e
branch '
m
aint-1
.
9' int
o
maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Me
r
ge bra
n
c
h 'm
a
int
-
1
.
8
.
5' into mai
n
t-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge branch 'jk/dotgit-
c
a
se-maint-1
.
8
.
5
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is_hf
s
_dotgi
t
: loose
n
o
ver-ea
g
e
r match of
\u{
.
.
47}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Prepare
f
or 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Merge branch
'jk/rebuild
-
perl-scripts-
w
it
h
-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Haman
o
Mer
g
e branch 'jk/no-perl-tests' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
Merg
e
branch '
p
o/everyd
a
y-doc
'
i
nto maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
Merg
e
branch 'jk/push-simple
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C
H
amano
Me
r
g
e
branch '
m
h
/
c
o
n
fi
g
-flip-x
b
it-b
a
ck
-
after-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
M
e
rge
b
ranch '
j
k/gitweb-w
i
th-new
e
r-cgi-multi-para
m
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hamano
Merge branch 'rs/receive-pack-use-
l
a
b
s' into
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Merge branch '
r
s/
m
ai
n
t
-
c
on
f
ig-u
s
e-labs' into
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Hamano
Merge bran
c
h '
j
s/w
i
n
dow
s
-open-
e
isdir-error'
i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C
H
a
mano
Merge br
a
nch
'jk/c
o
lors-
f
ix'
i
nto
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/
c
hec
k
o
u
t-from-tree' in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
Al
e
xander
K
uleshov
clean:
t
ypofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
u
n
i
o 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
Sy
n
c with
v
2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git 2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
Hamano
S
y
nc
w
ith 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
Jun
i
o
C Hamano
Sy
n
c
with
v1
.
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 Haman
o
Merge branch 'dot
g
i
t
-cas
e
-maint-1
.
8
.
5'
i
nto maint
-
1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes S
c
hi
n
delin
fsc
k
: compla
i
n about NTFS
"
.
gi
t
" aliases
in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Sch
i
ndelin
read-cach
e
: optionally d
i
sal
l
o
w NTFS
.
g
it v
a
riants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jo
h
ann
e
s
Schind
e
lin
path: add is_ntfs_dotgi
t
(
) helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck
:
complain about HFS+
"
.
gi
t
"
alia
s
es in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
King
r
e
a
d
-cache
:
optionally d
i
sa
l
l
o
w
HFS
+
.
git variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
u
t
f
8
: add is
_
hf
s
_dot
g
it() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
eff King
fs
c
k: notice
.
git
c
ase-insensit
i
v
el
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t145
0
:
refac
t
or
"
.
", "
.
.
", an
d
"
.
git" fsck t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f Kin
g
ver
i
fy
_
d
o
tfile(): reject
.
git case-insensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-tree: add tests fo
r
con
f
using pa
t
hs like
"
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Ki
n
g
u
npack-trees: pr
o
pagate errors adding entries
t
o the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
r
e
ad_packed_refs: use ski
p
_pre
f
i
x i
n
stead of stat
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
J
e
ff King
read_packed_refs: p
a
ss strbuf to parse_ref_li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Je
f
f Ki
n
g
rea
d
_pack
e
d_re
f
s
:
use a
s
t
rbuf
f
o
r
readi
n
g lin
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wampl
e
r
git-am
.
txt: --ignor
e
-d
a
te flag
i
s n
o
t passe
d
to git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
J
u
nio C Hamano
Me
r
ge branch 'mai
n
t' of git://github
.
com/
g
it-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C
H
aman
o
St
a
rt
pos
t
2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Je
f
f
Kin
g
for_each_r
e
flog_
e
nt_reverse: tu
r
n left
o
v
e
r
c
h
eck i
n
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff K
i
ng
for
_
each_reflog_en
t
_r
e
v
e
r
s
e
:
f
i
x
newlines on block
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
J
e
ff King
push: tru
l
y use "simpl
e
" as de
f
ault, not "upstream"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Jun
i
o C
H
amano
Gi
t
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
M
a
r
c
Branch
a
u
d
RelNot
e
s
:
spelling &
grammar twea
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike Hommey
s
h
a1_
n
a
m
e
: av
o
id unnecessary sha1
l
ookup in
f
i
nd_un
i
q
u
e
_
abbrev
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Hamano
Gi
t
2
.
2
.
0-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Michael J G
r
uber
add: ignore on
l
y igno
r
e
d
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff
King
t
4
026: test "normal" c
o
l
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jef
f
Kin
g
c
onfig: fix
parsing of "git co
n
fig --get-c
o
l
or some
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jef
f
K
i
ng
docs: describe
A
NSI 256-co
l
or mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o
C
Hamano
Merge br
a
nch
'sv/submitting-fin
a
l-patch'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io C Ha
m
a
no
Merge branch 'sn/tutorial-status-out
p
ut-exam
p
le'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io C Hamano
Merge
branch 'mh/doc-remote-helper-xr
e
f'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o C Hamano
M
e
rge
b
r
a
nch
'
tb
/
no-re
l
a
t
ive-file-url
'
commit
|
commitdiff
|
tree
2014-11-19
J
unio
C
Ham
a
no
M
e
r
ge branch
'
cc/inte
r
pret
-
trailers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
gitweb:
ha
c
k around CGI'
s
list-context p
a
ram() handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Makef
i
le:
have
p
y
t
hon
s
c
r
i
p
ts depend on NO
_
PYTHON settin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Makefile: si
m
plify by using
SCRIPT_
{
PERL,
S
H}_GEN m
a
cros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Junio C Haman
o
Merge git://github
.
co
m
/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge branch 'jc/doc-
c
ommit-
o
nly'
commit
|
commitdiff
|
tree
2014-11-18
J
unio C Hamano
Merge branch 'ta/tutor
i
al-moder
n
ize'
commit
|
commitdiff
|
tree
2014-11-18
Junio
C
Hamano
Me
r
ge bra
n
ch 'da/d
i
ff
t
ool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t960[34]: mark cvsimpor
t
t
est
s
a
s re
q
uiring perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t0090:
m
ark add-i
n
te
r
active test wi
t
h PE
R
L prerequisi
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
J
eff King
Makefile: have perl
sc
r
ipts depend
o
n
N
O_PERL setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
M
ichael Haggerty
c
r
eate_default_fil
e
s(): don't set u+x bit
on $GIT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Jun
i
o
C Hamano
Merge br
a
n
ch
'
maste
r
'
of
git://githu
b
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
brian m
.
carls
o
n
Do
c
u
m
e
n
tation: cha
n
ge "g
i
tlin
k
" typo in git-
p
ush
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Re
n
é Scharfe
use
la
b
s
() for
v
a
riables of
type long instead of abs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
René Sc
h
arfe
use labs() for
v
ari
a
bles
o
f type lo
n
g
i
ns
t
e
a
d of abs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Johann
e
s Sixt
Windows: correct detection of
E
IS
D
I
R
in mingw_open()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-14
Da
v
id Aguilar
dif
f
tool: honor --trust-exit-code for builtin to
o
ls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-14
Junio C
Ham
a
no
Git 2
.
2
.
0
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
J
eff King
appro
x
idate: allow ISO-like dates far
in the future
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Jeff
K
ing
checko
u
t $tree: do
n
ot
thro
w
away unchanged index entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Jeff King
pass T
I
ME_DATE_NOW t
o
approx
i
date future-check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Stefan Naew
e
gittutorial: fix output of 'g
i
t s
t
atus'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Torsten Böger
s
h
ausen
t570
5
: the file:// URL shoul
d
b
e
a
bsolute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Slavomir
V
lcek
Submi
t
tingPatches: final submission
is To
:
ma
i
n
ta
i
n
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
Junio
C Ha
m
ano
Update
draft re
l
ease notes to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
J
un
i
o
C
Hamano
Sync
with 'main
t
'
commit
|
commitdiff
|
tree
2014-11-12
Ju
n
io C Hamano
Merge branch 'nd/gitignore-tra
i
ling-whit
e
s
p
a
c
e
' into
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Junio C
Hama
n
o
Merge branch
'j
k
/
f
etch-reflog-
d
f-conflict'
commit
|
commitdiff
|
tree
2014-11-11
Ma
x
Hor
n
doc: add some crossrefs between
m
anual pages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next