repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
am --abort: revert changes introduced by failed 3way merge
2015-06-08
Paul Tan
am
-
-
abort: rev
e
rt changes introduced by fai
l
e
d 3way
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --skip: support skipping
wh
i
le on unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
am
-3: s
u
pport
3
way merge
on unbor
n
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
an
am --ski
p
: re
v
ert
changes introduced by
f
a
iled 3w
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
J
unio C
H
amano
Git 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C Hama
n
o
Merge branch 'jk/read-packed-ref
s
-without
-
p
a
t
h-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Hamano
Merge br
a
n
ch 'mg/a
d
d-
i
gnore-err
o
rs' into m
a
in
t
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
a
mano
Merge branch 'mh/f
i
n
d
-uniq-abbrev' i
n
to maint
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Hamano
M
e
rge bran
c
h
'
jk/appro
x
idate-
a
void-y-d-m-o
v
e
r-futur
e
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ha
m
ano
M
erge b
r
a
nch
'
rw/apply-doe
s
-not-
t
ake-ignore-d
a
te'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Hamano
Merge bra
n
ch 'jk
/
f
or
-
each-reflog
-
e
n
t
-reverse' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio
C Hamano
Merge branch 'm
a
int-2
.
1' int
o
main
t
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge bra
n
ch 'maint-2
.
0'
into ma
i
nt-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio
C Haman
o
Merge br
a
nch 'maint-1
.
9' i
n
to maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Ham
a
n
o
M
erge bra
n
ch 'maint-1
.
8
.
5' into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge branch 'jk/do
t
g
i
t-cas
e
-main
t
-1
.
8
.
5'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Je
f
f K
i
ng
is_hfs
_
d
otgit: loosen o
v
er-eager m
a
tch of \
u
{
.
.
4
7
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Prepare for
2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Ha
m
ano
M
e
r
g
e bra
n
ch 'jk/rebuild-per
l
-s
c
ripts-with-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io
C Hamano
Merge
b
ranc
h
'jk/no-perl
-
tes
t
s' into maint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Hamano
Merge
branch 'po/everyday-doc' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
Mer
g
e branc
h
'jk/push-simple'
into maint
commit
|
commitdiff
|
tree
2014-12-22
J
uni
o
C
Ha
m
ano
Merge branc
h
'mh/config-flip
-
xbit-back-afte
r
-
checkin
g
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merg
e
b
ranch 'j
k
/gitweb-with-ne
w
er-cgi-mu
l
ti-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merg
e
branch
'rs/r
e
ceive
-
p
ack-use
-
labs' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Mer
g
e branch 'rs/main
t
-config-
u
se-labs'
i
nto m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
e
rge
b
r
a
n
ch
'
js/window
s
-open-eisdir-err
o
r' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Me
r
ge
b
ranch 'jk/colors-fix' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Hamano
M
e
r
g
e
bran
c
h
'jk
/
checkout-from
-
tree'
i
nto maint
commit
|
commitdiff
|
tree
2014-12-22
Alex
a
nder
Kuleshov
cl
e
an: 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
Junio
C H
a
mano
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
Juni
o
C Hama
n
o
S
y
nc with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C
Hamano
G
i
t 2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C Hamano
Sync wi
t
h v
1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
unio C Ha
m
ano
Git
1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
unio C Hamano
Sync
w
ith
v
1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C Hamano
Git 1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
u
n
io
C
Haman
o
Merge br
a
n
c
h 'dotgit-case-maint-1
.
8
.
5' into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes
S
chindelin
fs
c
k
:
c
omp
l
ain a
b
o
ut NTFS "
.
git" aliases i
n
trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
read-cache: optiona
l
l
y
disallo
w
NTF
S
.
git variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johann
e
s Schindelin
path: add
i
s
_
ntfs_dotg
i
t
(
)
he
l
per
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
fsck
:
complain about HFS+ "
.
git" al
i
ases in trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
r
ead-cach
e
:
option
a
lly
disallow H
F
S+
.
git va
r
iants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
King
ut
f
8: add is_hfs_dotgit()
h
e
lper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
King
f
sck: notice
.
g
it
c
a
s
e-insensitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
King
t1450: refactor
"
.
", "
.
.
", and "
.
g
it" fs
c
k tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
verify_d
o
tf
i
le
(
): re
j
ect
.
g
i
t case-insens
i
t
ive
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-tree: add tests for
c
onfusing paths like "
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
unpack-
t
rees: propagate errors adding entries to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff Kin
g
read_packed_refs: use skip_
p
refix instead of stati
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
J
e
f
f King
read_p
a
cked_refs: pas
s
strbuf to parse
_
ref_li
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff Kin
g
r
e
ad_
p
ac
k
ed_refs: use a strb
u
f for read
i
n
g
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wa
m
pl
e
r
git-am
.
t
x
t: --i
g
nore-da
t
e flag
is not passed t
o
gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Mer
g
e br
a
nc
h
'maint
'
of git://
g
ithu
b
.
com/git-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Jun
i
o C H
a
mano
St
a
rt po
s
t 2
.
2
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_reflog_ent_r
e
verse: turn leftover check in
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Je
f
f King
for_each_
r
efl
o
g_ent_reverse: fix newlines on b
l
ock
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
Jeff Kin
g
push: truly us
e
"s
i
mple" as default, n
o
t "
u
pstrea
m
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Juni
o
C Hamano
G
i
t
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Marc Brancha
u
d
RelNot
e
s
: spelling & gram
m
ar
t
w
eaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mik
e
Hom
m
ey
s
ha1_name: avoid unnece
s
sary sha
1
loo
k
up 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-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Michael J Gruber
add: ignore only ign
o
red fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
J
e
ff King
t
4
026: tes
t
"normal" color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff Kin
g
config
:
f
i
x parsing of
"
git config --get-color some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
J
eff K
i
ng
docs:
describe A
N
SI
256-color m
o
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio C
Hamano
Merg
e
bra
n
c
h 'sv/submitting-fina
l
-patch'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o C Hamano
M
e
rge br
a
nch 'sn/tu
t
orial-status-outpu
t
-exa
m
ple
'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io C Ha
m
an
o
M
erge branch 'mh/doc-re
m
ote-
h
e
lper-x
r
ef'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
M
e
r
ge branch 't
b
/n
o
-r
e
lative-fil
e
-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
H
a
m
an
o
M
e
rge bran
c
h 'cc/interpre
t
-trail
e
rs
'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
git
w
eb:
h
ack around CGI's list-context param() handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
M
a
kefile: have python
scripts depend o
n
NO_PYTHON
s
etting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan
Nieder
Makefi
l
e: simpli
f
y by using SCRIP
T
_
{
PERL,
S
H}
_
GEN
m
a
cros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Junio C
H
amano
Merge git://github
.
com/git-
l
1
0n/git-po
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C
Hamano
M
e
r
ge branch 'jc/doc-commit
-
only
'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
M
er
g
e branch 'ta/tutorial-
m
oderni
z
e'
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C Hamano
Me
r
ge branch 'da/dif
f
tool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff
K
i
ng
t960[34]: mark cvsim
p
ort tests as requiring p
e
rl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jeff Kin
g
t0090: mark add-inter
a
ctive tes
t
wi
t
h
PERL prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
J
eff King
M
a
kefile: have perl
s
cripts dep
e
nd on NO_PER
L
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
M
ic
h
ael Haggerty
create_default
_
file
s
(): don't s
e
t
u
+x
bi
t
on $GIT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
J
u
ni
o
C
Hamano
Merge branch 'm
a
ste
r
' of gi
t
:/
/
github
.
com/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
brian m
.
carlson
Documen
t
ation: ch
a
nge "git
l
ink" t
y
po in git-pu
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
René Sch
a
rfe
use labs() f
o
r variables of t
y
pe l
o
n
g instead of abs()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
René Scharfe
us
e
labs()
f
or variables
of type long inste
a
d
of
a
b
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
Johanne
s
Sixt
Windo
w
s:
c
o
rrect detection of EISDIR in mingw_open()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
di
f
ftool: honor --trust-exit-
c
ode for builtin
t
ools
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-14
J
u
nio C Hamano
Git
2
.
2
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Jeff King
approxidate: al
l
ow ISO-
l
ike dates f
a
r
i
n the
future
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Jeff K
i
ng
c
h
e
c
kout $tree: do n
o
t throw away unchanged ind
e
x entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Jeff
K
i
n
g
pass TIME_DATE_NOW to appro
x
idate future-check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Stefan
N
aewe
gi
t
tuto
r
i
al: fix out
p
u
t
of 'git status'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
To
r
sten Bögershausen
t57
0
5
: the
f
ile:// URL should be ab
s
olute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-13
Slavomir Vlc
e
k
Submitti
n
gPatches: final submissio
n
is To: maintainer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Junio C
H
amano
U
p
date draft releas
e
notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Juni
o
C Haman
o
Sync with 'maint'
commit
|
commitdiff
|
tree
2014-11-12
Junio C Hamano
Merg
e
branch 'nd/
g
itignore-t
r
ailing-whitespace' i
n
to
.
.
.
commit
|
commitdiff
|
tree
next