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
merge: extract prepare_merge_message() logic out
2015-04-29
Junio C
Hamano
merge: extr
a
ct
prepare_merge_mes
s
age() lo
g
ic o
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
m
erg
e
: narrow
scope
of
m
erg
e
_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hama
n
o
merge: split reduce_par
e
nt
s
() out
of
collec
t
_
p
a
r
e
nts()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
m
e
rge: clar
i
fy collect_parents() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C Hamano
merg
e
: small le
a
kfix
a
nd code simpli
f
ication
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
do not
check argc t
o
determ
i
ne
n
um
b
er of r
e
mote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Ham
a
no
me
r
ge: clarify "pull
i
n
g into vo
i
d
"
sp
e
c
i
al case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
t
5
520: t
e
st pulling an oct
o
pus into an unb
o
r
n
b
ranch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o
C Hamano
t5520:
sty
l
e fi
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: simplify c
o
de flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merg
e
: test the top-level
me
r
ge driv
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C
Hama
n
o
Git
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Mer
g
e branch '
j
k/read
-
p
a
cked-refs-without-path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Merge branch 'm
g
/
add-ignore-er
r
ors' into maint
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o C Hamano
M
erge branch 'mh
/
find-uniq-abbrev'
i
nto maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
M
e
rge branch 'jk/approxidate-avoid-y-d-m-ove
r
-
future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Hamano
Merge branch 'rw/appl
y
-does-not-take-ignore-
d
a
te
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Hamano
Me
r
ge bra
n
ch
'
jk/for-
e
ach-re
f
log-ent-revers
e
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ham
a
no
M
erge
b
ranc
h
'maint-2
.
1'
i
n
to maint
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merg
e
branch '
m
aint-2
.
0' i
n
to
m
aint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Haman
o
Merge branch 'maint
-
1
.
9' into ma
i
nt-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Ju
n
i
o
C Hamano
Merge branch 'maint-1
.
8
.
5
'
into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
a
m
a
no
M
e
rge bra
n
ch 'jk/dotgit-
c
ase
-
maint-1
.
8
.
5
' into
m
ain
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is_hfs_dotgit
:
lo
o
sen
o
ver-eager match of \u{
.
.
47
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C H
a
mano
P
r
e
p
ar
e
for
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/
r
ebuild-perl-scri
p
ts-wit
h
-no
-
perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
aman
o
Merge branch 'jk/no-per
l
-
t
es
t
s' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio
C
Hamano
Merge bra
n
ch '
p
o
/
eve
r
yday-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Mer
g
e branch 'jk/push-sim
p
le
'
into
m
a
i
n
t
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hamano
Mer
g
e b
r
an
c
h
'm
h
/co
n
fig-
f
l
i
p-x
b
it-bac
k
-after-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
a
no
Merge branch
'jk/
g
it
w
eb-
w
ith-n
e
wer-cgi-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge bra
n
ch
'rs/r
e
ceive-pack-use-labs
'
into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o
C Hamano
M
e
rge branch 'rs/ma
i
nt-config-use-labs' i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'js/windows-open-eisdir
-
er
r
or' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
M
e
rge branch 'jk/c
o
lors-fi
x
'
i
n
to maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Hamano
M
erge branch 'jk/
c
he
c
kout-from-
t
ree' into maint
commit
|
commitdiff
|
tree
2014-12-22
A
l
exa
n
d
e
r
Ku
l
e
shov
clean: 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
J
u
ni
o
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
Jun
i
o
C
Hamano
Sync wi
t
h v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
G
it 2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
Haman
o
Sync
w
ith
v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C Hamano
Git 1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
u
ni
o
C Hamano
Sync
wit
h
v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
ama
n
o
G
it 1
.
8
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
m
a
no
Merge br
a
nch 'dotgi
t
-case-maint-1
.
8
.
5' into
maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johanne
s
Sc
h
indelin
fsck: compla
i
n
a
bout
NTFS "
.
git" alias
e
s in
t
rees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
o
h
an
n
es Schindelin
rea
d
-cache: optionally disa
l
lo
w
NTFS
.
git
v
ariants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Joh
a
nnes Schin
d
elin
p
ath: add is_ntfs_d
o
tgit() h
e
l
p
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
f
sck: co
m
pla
i
n about
H
F
S
+
"
.
gi
t
" aliase
s
in
trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f King
read-cache: optiona
l
ly disallow HFS+
.
git variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
f
f King
u
tf8
:
add is_h
f
s_dotgit
(
) helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck:
notice
.
git
c
ase
-
insensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t1450: refactor "
.
"
,
"
.
.
"
, and "
.
git" fsck te
s
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
ver
i
fy_do
t
f
i
le
(
): reje
c
t
.
git case-insensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff K
i
n
g
rea
d
-
tr
e
e: add tests for confusi
n
g
p
a
t
h
s
like "
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
Ki
n
g
u
n
pac
k
-trees: propag
a
te e
r
rors adding
e
ntries to
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_pac
k
ed_refs:
use s
k
ip
_
pre
f
ix instea
d
of static
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
J
eff King
r
ead_
p
acked_refs:
pass strb
u
f to
parse_ref_line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
J
e
f
f
King
read_pac
k
ed_
r
efs: us
e
a strbuf for
r
e
ading lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wampler
git-am
.
txt: --ignore-d
a
t
e
flag is not passed to git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Ju
n
io C Hamano
M
e
rge branch
'maint' of git://gi
t
h
ub
.
com
/
g
it-l
1
0n
/
git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Start p
o
st 2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff Ki
n
g
f
o
r
_each_reflog_ent_rev
e
rse: turn lefto
v
er
check into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
J
e
ff Ki
n
g
for_each_refl
o
g_ent_r
e
verse:
f
i
x
n
e
wlines on
bloc
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jeff King
push: truly u
s
e
"
simpl
e
"
as
default, not
"upst
r
eam"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Ju
n
io
C
Hama
n
o
Git 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Marc Branch
a
ud
RelNotes: spe
l
l
ing & g
r
ammar tweaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike Ho
m
mey
sha1_
n
ame
:
avoi
d
unnecessary sh
a
1 looku
p
in
find_uni
q
u
e_abb
r
ev
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Hamano
Git 2
.
2
.
0
-
r
c3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Michael J Grub
e
r
add
:
i
gnore onl
y
ignored files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jef
f
K
ing
t4026: test "normal" color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
config: fix pars
i
n
g of "git con
f
ig -
-
get-color som
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
J
e
ff King
do
c
s: describe
A
N
SI 256-c
o
lor mod
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merg
e
b
ranch 'sv/su
b
mitting-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
i
o C Haman
o
Merg
e
branch 'sn/t
u
tor
i
al-
s
tatus
-
output-exampl
e
'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hama
n
o
M
e
rge branch 'mh/
d
oc-r
e
mote
-
h
e
lpe
r
-xr
e
f'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
H
a
mano
M
e
rge branch 'tb/no
-
rela
t
ive-
f
ile-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
H
amano
M
e
r
g
e
bran
c
h
'
c
c/interpret-tr
a
ilers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
gitweb: h
a
ck
arou
n
d CGI's
list-conte
x
t param() handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Makefile: have p
y
t
ho
n
sc
r
ipts de
p
en
d
on NO_PYTH
O
N set
t
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan
N
ieder
Makefile: simplify by us
i
n
g
SCRIP
T
_
{
PERL
,
SH}_GEN macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Junio C Ham
a
no
Merge git
:
//github
.
com/git-l10n/gi
t
-
p
o
commit
|
commitdiff
|
tree
2014-11-18
Junio C
H
amano
Me
r
ge bra
n
ch 'jc/
d
oc
-
commit-o
n
ly'
commit
|
commitdiff
|
tree
2014-11-18
Jun
i
o
C Hamano
Merge branc
h
'ta/tu
t
orial-mode
r
nize
'
commit
|
commitdiff
|
tree
2014-11-18
Jun
i
o C Hamano
Merge b
r
a
nch 'd
a
/difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff
K
ing
t
9
60[
3
4]
:
mark c
v
simpo
r
t tests as requirin
g
perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff
K
ing
t
0
090: mar
k
add-interac
t
ive test
w
ith PERL prer
e
quisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jef
f
Ki
n
g
Makef
i
le:
have
p
er
l
scri
p
ts d
e
pend
o
n NO_PERL se
t
ti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Michael H
a
g
g
erty
create_defa
u
lt_file
s
(): do
n
't set u+x
bit o
n
$GIT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Junio C Hamano
Merge bra
n
ch 'master'
o
f git:/
/
github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
bria
n
m
.
carlson
Documenta
t
ion: c
h
an
g
e "gi
t
lin
k
" typo
in git-push
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
René Scharfe
use labs(
)
for va
r
i
a
b
les of typ
e
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 typ
e
long in
s
tead of
abs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Jo
h
ann
e
s
Sixt
Wind
o
ws: correct
detection
of
E
I
S
DI
R
in
mingw_open()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-14
David
Aguilar
diffto
o
l: honor --t
r
ust-exit-code fo
r
bui
l
tin
t
ools
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-14
Junio
C Hamano
Git
2
.
2
.
0-r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Je
f
f Ki
n
g
appro
x
idate:
a
llow ISO
-
like
dates far in the future
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-13
Jeff King
checkout
$
tr
e
e:
do not t
h
row away unchanged
i
n
dex entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next