repo.or.cz
/
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
Paul Tan
am
-3
:
su
p
por
t
3way
merg
e
on u
n
born
branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am --ski
p
:
revert changes
i
ntroduc
e
d by
f
ailed 3way
.
.
.
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 Hamano
Me
r
ge branch
'
jk/read-
p
acked-refs-witho
u
t-path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Haman
o
M
e
rge branch 'mg/add-ign
o
re-
e
rrors' into maint
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o C Hamano
M
erge branch 'm
h
/
find-uniq
-
a
b
brev'
i
nto maint
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C Ham
a
no
Merge bra
n
ch 'jk/approxidate-avoid-y-d-m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ham
a
no
Merge branch 'rw/appl
y
-does-not-take-ign
o
re-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Me
r
ge b
r
a
n
c
h
'
jk/for-
e
ach-reflog
-
ent-reverse' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio
C H
a
mano
M
erge bra
n
ch
'
maint-2
.
1'
i
nto main
t
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ha
m
ano
Merge branch 'm
a
int-2
.
0' into maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio
C
Hamano
Merg
e
branch 'maint-1
.
9' into
m
aint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C H
a
mano
Merge br
a
nch 'maint-1
.
8
.
5' into
maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
u
ni
o
C Hamano
Merg
e
branch 'jk/dotgit-case-mai
n
t-1
.
8
.
5' into maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is_
h
f
s
_dotgit: lo
o
sen over-eager ma
t
ch of \u{
.
.
47}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Prepa
r
e
f
or 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge bran
c
h
'
jk/rebuild-
p
erl-scr
i
pts-with
-
no-p
e
rl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Mer
g
e b
r
anch 'jk/no-p
e
rl-tests' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge branch
'
p
o
/
e
veryda
y
-doc
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
H
ama
n
o
Merge
b
r
anch 'jk/pus
h
-simple' into m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Ham
a
no
M
er
g
e
branc
h
'mh/config-flip-xbit-ba
c
k-aft
e
r-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
m
a
n
o
Merge br
a
nch 'jk/gitweb-with-newer-c
g
i-m
u
lti-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge bra
n
c
h
'rs
/
rece
i
ve
-
pack-use-labs'
i
nto
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
Me
r
ge branch
'
r
s/main
t
-confi
g
-
use
-
labs
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
Merge branch 'js/windows-ope
n
-eisdir-error
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
io C Ha
m
ano
Merge
b
r
a
n
ch
'
jk/colors-
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C Hama
n
o
Merge br
a
nch
'jk/checkout-fr
o
m-tr
e
e
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Alexander Kuleshov
c
lean: 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
Jun
i
o C
H
amano
Sync wi
t
h v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
H
amano
Git 2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
C
H
amano
Sync with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o 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 Haman
o
Sync with
v
1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
mano
Git 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
Juni
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
J
u
nio C Hamano
Merge
bra
n
c
h
'dotgit-case-maint-1
.
8
.
5' into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindel
i
n
fsck
:
complain
a
bout N
T
FS "
.
git" alia
s
es in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johan
n
es Schin
d
e
l
i
n
read-cache: optionally d
i
s
al
l
o
w
NTFS
.
git variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
p
ath: a
d
d i
s
_n
t
fs_dotgit() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff K
i
ng
fsc
k
: complain ab
o
ut HFS+ "
.
git" aliases in
tre
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
Ki
n
g
r
ead-cache: optionally
dis
a
llow HFS
+
.
git va
r
iants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff K
i
ng
ut
f
8: add is_hfs_d
o
tgit(
)
helpe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck:
n
o
tice
.
git case-insensi
t
ively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
eff King
t
1450: refactor "
.
", "
.
.
", and "
.
g
i
t" fsck tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
verif
y
_dotfi
l
e():
r
e
je
c
t
.
g
it ca
s
e-insensitiv
e
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-tre
e
:
a
dd tests for confusing
paths li
k
e "
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
unpa
c
k-tree
s
:
p
r
opagate errors
a
d
d
ing e
n
tries to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff Kin
g
rea
d
_pac
k
ed_
r
efs:
use skip_prefix instead of static
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jef
f
Kin
g
read_packed_
r
efs: pass strbuf
to pars
e
_ref_li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Je
f
f King
read
_
packed_refs: us
e
a
s
t
rbuf
f
or reading lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronal
d
Wampl
e
r
git-am
.
tx
t
: --igno
r
e
-
date f
l
ag
i
s
n
o
t
pa
s
sed to
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jun
i
o C
Ha
m
ano
Merge
b
ranch 'maint' of git:/
/
gith
u
b
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio
C Hamano
S
t
art post 2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff Ki
n
g
for_each_r
e
flog_ent_reverse: turn leftover check into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
J
eff King
for_e
a
ch_reflog_ent_
r
everse: fix newl
i
n
e
s on
b
lock
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jeff King
push: truly use "simple" as default, not "ups
t
ream"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Junio C Hamano
G
i
t 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Marc Branc
h
aud
Rel
N
ote
s
: sp
e
llin
g
&
g
r
amm
a
r twe
a
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mik
e
Hommey
sha1_name: avoid unnecessary
sh
a
1 looku
p
in
fi
n
d_uni
q
ue_
a
bb
r
ev
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 Gr
u
ber
add: ignor
e
o
nly ign
o
red files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
J
e
f
f
King
t
4
026: test "normal" color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
J
e
ff King
con
f
ig: fix parsing of "git
c
o
nfig
--get-color some
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff Kin
g
d
o
cs: describe ANSI
2
5
6-color mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch 'sv/submi
t
t
i
n
g
-
f
inal-patch'
commit
|
commitdiff
|
tree
2014-11-19
Juni
o
C Hamano
Mer
g
e bra
n
ch 'sn/tutorial-status-out
p
ut-
e
xample'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
Ham
a
no
M
e
rge branc
h
'mh
/
doc-remot
e
-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
H
amano
Mer
g
e branch
'tb/no
-
relat
i
ve-file-url'
commit
|
commitdiff
|
tree
2014-11-19
Juni
o
C Hamano
Merge br
a
nch
'
cc/interpret
-
tra
i
ler
s
'
commit
|
commitdiff
|
tree
2014-11-18
J
e
ff Ki
n
g
gitweb: hack aro
u
nd CGI's list-c
o
ntext param() handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
J
onathan Nieder
Makefile: have python scri
p
ts depe
n
d on NO_PYTHON setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Makefile: s
i
mplify by using S
C
RIPT_{PER
L
,SH}_GEN mac
r
os
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio C Hamano
Mer
g
e
g
i
t
://github
.
com/
g
i
t
-l
1
0n/g
i
t-po
commit
|
commitdiff
|
tree
2014-11-18
Junio C
Hamano
Merge b
r
anch 'jc/doc-commit-o
n
ly'
commit
|
commitdiff
|
tree
2014-11-18
Jun
i
o C H
a
mano
Merge branch 'ta/tutori
a
l
-m
o
der
n
ize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merg
e
b
ranch 'da/d
i
fftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff
Kin
g
t960[34]: mark cvs
i
mport tests as requir
i
n
g
p
e
r
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t
0090: mark
a
dd-int
e
ractiv
e
test w
i
th PERL prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
J
eff King
M
a
ke
f
ile: have perl scri
p
ts depen
d
on
NO_PERL setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Michael H
a
ggerty
cr
e
ate_default_fi
l
es(): don't set u+x
bit on $GIT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Juni
o
C Hamano
Merge branch 'maste
r
'
o
f git://
g
i
thub
.
com/git-l1
0
n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
brian m
.
c
a
rl
s
on
D
ocumentation: change "git
l
ink" typo in git-push
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
R
e
né Scharfe
use labs() for
v
ariables
of type long
i
nst
e
ad of abs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
R
e
né S
c
harfe
use labs() for
v
aria
b
les of type
l
ong
i
nstead of abs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Johannes Sixt
W
i
ndow
s
: cor
r
ect detect
i
on of EISDI
R
in mingw_op
e
n()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
di
f
f
t
ool: honor --trust-exit-cod
e
for builtin tools
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-14
Junio C Hamano
Git
2
.
2
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Jeff King
a
p
proxid
a
te
:
allow
I
SO-like
dates far
in the f
u
ture
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
J
eff King
check
o
ut $tree:
d
o not t
h
row away
u
nc
h
anged index
entr
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
J
e
ff King
pass TIM
E
_DATE_NOW
to approxidate fut
u
r
e
-
check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Stefan Naewe
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
ögershause
n
t570
5
: t
h
e file:
/
/ URL
should be abso
l
ut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Sla
v
omir V
l
ce
k
Subm
i
ttingPatch
e
s: final submission is
T
o:
m
aintainer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
Ju
n
io C Ham
a
n
o
Update draft release no
t
es to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
Jun
i
o C Hamano
Sy
n
c wi
t
h 'm
a
int'
commit
|
commitdiff
|
tree
2014-11-12
Junio C Hamano
M
erge bran
c
h 'nd
/
gitignore-trailin
g
-whitesp
a
ce'
into
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Junio C Haman
o
Merg
e
bra
n
ch
'jk/
f
e
t
ch-reflog-df-co
n
flict'
commit
|
commitdiff
|
tree
2014-11-11
M
a
x Horn
do
c
: ad
d
so
m
e crossr
e
fs b
e
twe
e
n man
u
al pages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next