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
T
an
am -3: suppo
r
t
3way merge on unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --ski
p
: revert changes intr
o
duc
e
d by
f
ai
l
ed 3way
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
G
i
t
2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Merge
b
ranch 'j
k
/read
-
p
a
cked-refs-wi
t
hout-
p
ath
-
max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C
Hamano
M
erge branch
'mg/add-ignore-errors' into ma
i
nt
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Haman
o
M
erge branch 'mh/fi
n
d
-uniq-abb
r
ev' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Hamano
Merg
e
b
r
a
nch 'jk/approxidate-
a
void-y-d-m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C Hamano
M
e
r
g
e branch 'r
w
/app
l
y-does-not-take-ign
o
re-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C Hamano
Merge branch 'jk/f
o
r
-
e
a
ch-reflog-ent-reverse' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Ju
n
io
C
Hamano
Merge
branch
'mai
n
t-2
.
1' into m
a
i
nt
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
J
u
nio C Hamano
Mer
g
e br
a
nch 'm
a
i
n
t-1
.
9' into
ma
i
nt-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Ha
m
an
o
Merge
branch 'maint-1
.
8
.
5' in
t
o maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
u
n
io C
H
amano
M
er
g
e branch
'jk/do
t
git
-
c
a
s
e
-
maint-1
.
8
.
5
'
i
nto m
a
int
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is_hfs_dot
g
it
:
loosen o
v
er-eager match of \u
{
.
.
47}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
Prepare
f
o
r
2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Ha
m
ano
Merge branch 'jk/rebuild-perl-scri
p
ts-with-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C
H
a
m
ano
Merge branch 'jk/no-perl-tests' into
main
t
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
i
o C Hamano
Merge
branch 'po/everyday-
d
oc' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
Merge branch 'jk/push-simple' into maint
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hamano
Merge br
a
nch '
m
h/confi
g
-fli
p
-xbit-b
a
ck-af
t
er-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
M
e
rge
branch 'jk
/
g
i
tweb-wi
t
h
-newe
r
-cg
i
-multi-para
m
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C
Hamano
Merge b
r
anch '
r
s/receive-pack-use-labs' int
o
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch '
r
s/maint-
c
onfig-use-labs' into main
t
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hamano
M
erge branch 'js/windo
w
s
-
open
-
eisdir-er
r
or
'
into main
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
Merge branch 'jk/col
o
rs-fix' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/c
h
eckout-from-tree' into m
a
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Ale
x
a
n
der Kulesho
v
clean: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C Hamano
Git 2
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
H
a
mano
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 Haman
o
Sync with
v
2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C
Ham
a
no
Gi
t
2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C
Hamano
Sync
w
ith
v
1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C Hamano
Gi
t
1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
Hamano
S
y
nc with
v
1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
Git 1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Merge bra
n
ch 'do
t
git-
c
ase-maint
-
1
.
8
.
5' i
n
to m
a
int-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Joha
n
n
e
s Schind
e
lin
fsck: compl
a
in about NT
F
S "
.
gi
t
"
a
li
a
s
e
s
in trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes
Schindelin
read-cache:
o
pt
i
onally disa
l
low NTFS
.
git
v
ariant
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
path
:
add is_ntfs_dotgit()
h
elper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
ef
f
King
fsck: compl
a
in about H
F
S+ "
.
git" aliases in
t
rees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
read-ca
c
he:
option
a
lly disallow HFS+
.
git
variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
ing
utf8: a
d
d
is_hf
s
_dotgit() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck: notice
.
g
i
t
c
ase-i
n
sensit
i
v
e
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t1450:
r
e
f
ac
t
or "
.
",
"
.
.
"
,
and "
.
gi
t
" fsc
k
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
King
verify
_
dotfi
l
e():
r
eject
.
git case-ins
e
nsi
t
ively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff K
i
n
g
read-tr
e
e:
add tes
t
s for confusing pat
h
s like
"
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
unpack-trees: p
r
opagate errors adding ent
r
i
e
s to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read
_
packed_r
e
fs: use
ski
p
_prefi
x
instead of static
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
J
eff K
i
ng
read_pac
k
e
d_re
f
s
: pass strbuf
to parse
_
r
e
f_line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed_refs: use
a
strbu
f
for r
e
adin
g
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wamp
l
e
r
git-am
.
txt: --ignore-date fla
g
is not pass
e
d to git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
J
unio C
H
amano
Me
r
g
e
b
r
anch 'maint' o
f
git:
/
/gi
t
hub
.
com/git-l10n
/
git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Ha
m
ano
Start post 2
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff
King
f
o
r_each_reflog_ent_rever
s
e: turn
l
efto
v
er
c
heck
i
nto
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
J
e
f
f King
for_each_reflog_
e
nt_reverse:
fix newlines on block
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
Jeff K
i
ng
pus
h
:
t
r
u
l
y us
e
"simple" a
s
d
e
fau
l
t,
not "
u
pstream"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Junio C Ham
a
no
Git 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Marc
Branchau
d
RelNotes:
s
p
ellin
g
& gra
m
m
a
r tweaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mike Hom
m
ey
sh
a
1_name: avo
i
d unnec
e
ssary sha1 lookup in find_unique_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
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Michael
J
Gruber
add: ignore on
l
y ignored files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Je
f
f King
t402
6
: test "normal" color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Je
f
f King
config: f
i
x pars
i
ng of "git config --
g
et-color some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff
King
d
o
cs: describe ANSI 25
6
-color m
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Ha
m
ano
M
erge branch
'
s
v/subm
i
tting-fin
a
l-
p
atc
h
'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
M
erge branch 'sn/tutoria
l
-
status-
o
utput-example
'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Mer
g
e branch 'mh/
d
oc-rem
o
te-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hama
n
o
Mer
g
e b
r
anch 'tb
/
no-re
l
ative-fil
e
-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
Hamano
M
er
g
e b
r
anch 'cc/int
e
rpret-trailers
'
commit
|
commitdiff
|
tree
2014-11-18
Jeff
K
i
n
g
gitweb: hack around CGI's list-con
t
ext param
(
) handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nied
e
r
Makefile: have py
t
h
o
n
scripts
d
epend on NO_PYTH
O
N setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jon
a
than Nieder
Makef
i
le: simp
l
ify by using
S
CRIPT_{PE
R
L,SH}_GEN macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Ju
n
io C Hamano
Me
r
ge git:/
/
github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
Junio
C Hamano
Merge
b
ranch 'jc/d
o
c-com
m
it
-
only
'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge
b
ranc
h
'ta/tutoria
l
-moderni
z
e'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge b
r
anch 'da
/
d
iffto
o
l'
commit
|
commitdiff
|
tree
2014-11-18
J
e
f
f K
i
ng
t
9
6
0
[
3
4
]:
mark cvsim
p
ort tes
t
s a
s
requir
i
ng
p
er
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Je
f
f K
i
ng
t00
9
0: mark add-i
n
teractive te
s
t wi
t
h
PERL pr
e
r
e
quisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jeff Kin
g
Makefile: hav
e
p
er
l
scripts depend on
NO_PERL setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Michael H
a
ggerty
create_def
a
u
l
t_file
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
Junio C Hamano
M
erg
e
branch 'master' of git://github
.
com
/
git-l10
n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
brian m
.
c
a
rlson
Doc
u
m
en
t
a
t
ion:
c
hange "gitlink" typo i
n
g
i
t-
p
ush
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
Ren
é
Scharfe
use labs() f
o
r v
a
ri
a
bles o
f
type long instead of abs()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
René Scharfe
use labs() for variables of type long
instead of
a
b
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
Johann
e
s Sixt
Windo
w
s:
co
r
rect
d
e
t
ect
i
on of EISDIR i
n
mingw_open(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
difftool: honor
--
t
ru
s
t
-exit-co
d
e
for
b
uiltin tools
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-14
Juni
o
C Ha
m
ano
Git 2
.
2
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Jeff King
appr
o
xidate: allow
ISO-like dat
e
s
f
ar in the future
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Jeff King
checko
u
t $tree: do not throw away unchanged ind
e
x entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
J
eff King
pass
TIME
_
DA
T
E
_
NOW to
a
pproxidat
e
fut
u
re-check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
St
e
fan Naewe
git
t
utorial: f
i
x out
p
ut of 'git
s
tatu
s
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Tor
s
t
e
n Bögershausen
t
5
7
05:
t
h
e
file:// UR
L
should be abso
l
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Slavomir Vlcek
Subm
i
ttingP
a
t
ches: final subm
i
s
s
ion is To:
maintainer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
J
u
nio
C
Hamano
Up
d
ate d
r
a
ft
r
elease notes
t
o
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Junio
C Hamano
Sync
w
ith
'
maint'
commit
|
commitdiff
|
tree
2014-11-12
Junio C
H
a
ma
n
o
M
erge branch 'nd/
g
itig
n
o
r
e-trail
i
ng-
w
h
itespac
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Ju
n
io
C
H
a
mano
Merge branch 'jk
/
fetch-reflog-df-conflict'
commit
|
commitdiff
|
tree
2014-11-11
Max Horn
doc: add some cr
o
ssrefs between manu
a
l
pages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next