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
t5520: test for failure if index has unresolved entries
2015-05-29
Pau
l
Tan
t5520: test
for failure i
f
index
h
as unresolve
d
entr
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t
5
520
:
t
e
st no me
r
ge candidat
e
s cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l Ta
n
t5
5
20
:
prevent
field
splitting in content comparisons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C H
a
man
o
me
r
ge: depreca
t
e 'git me
r
ge <message> HEAD <
c
ommit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: ha
n
dle FETCH_HEAD inter
n
ally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C
Hamano
merge: decide
if we auto-gen
e
rate the messag
e
early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C
Hama
n
o
merge: m
a
ke
c
ollect_parents() auto-
g
e
n
e
rate t
h
e merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: e
x
tra
c
t prepar
e
_merge_mes
s
age()
l
ogic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
m
e
rg
e
: narrow
s
cope of
merge_
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge: split r
e
d
u
ce
_
parents() out of collect_parents(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
Hama
n
o
m
er
g
e: clarify collect_pare
n
ts() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
H
amano
merge: small leakfix and
c
ode si
m
plification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge
:
do not check ar
g
c to determine number of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
m
erge: cl
a
r
ify "p
u
lling int
o
void" spec
i
al case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Haman
o
t
5
52
0
:
t
est pullin
g
an octo
p
us into an unb
o
r
n
branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520:
s
t
y
l
e fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: simplify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: test the top-l
e
vel merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C Hamano
G
i
t
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C H
a
m
an
o
Merge branch 'jk/read-
p
a
c
ked-re
f
s-without-pat
h
-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
u
ni
o
C
Hamano
Mer
g
e bran
c
h
'mg
/
add
-
igno
r
e-erro
r
s'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-01-12
J
u
n
i
o C
H
a
mano
Merge
b
r
a
nc
h
'mh/find-uniq-abb
r
e
v' int
o
main
t
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Merge
b
ranch 'jk
/
approxidate-avoid-y-
d
-m-over-
f
u
ture
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
uni
o
C Hama
n
o
Merge branc
h
'rw
/
app
l
y-do
e
s-not-take-
i
gn
o
re-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ham
a
no
Merge branch 'jk
/
f
or
-
each-re
f
log-ent-r
e
verse' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Ju
n
io C
H
amano
Mer
g
e branch '
m
aint-2
.
1'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hama
n
o
Merge b
r
a
nch 'maint-
2
.
0' into ma
i
nt-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C
Ha
m
ano
Merge bra
n
ch 'maint-1
.
9' into
maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Haman
o
M
erge bran
c
h
'
maint-1
.
8
.
5
' into maint-
1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio
C
Hamano
Merge
b
ranc
h
'
jk/dotgi
t
-case-maint-1
.
8
.
5'
i
nto
m
aint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff K
i
n
g
is_hfs
_
dotgit: loosen over-ea
g
er match of \u{
.
.
47
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio
C H
a
mano
P
r
epare 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/rebui
l
d-perl-scripts-wit
h
-no-
p
e
rl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
M
e
r
ge branch 'jk/n
o
-per
l
-tests' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merg
e
b
ranch 'po/everyda
y
-doc' into m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge b
r
anch 'jk/push-simp
l
e' into
m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C
Hamano
Merge
br
a
nch 'mh/config-flip-
x
bi
t
-back-after-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
mano
Merge branch
'
jk/git
w
eb-with-newer-cgi-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
n
o
Merge b
r
a
nch
'
rs/re
c
e
ive-p
a
ck-use-la
b
s' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'rs/main
t
-co
n
fig-us
e
-
labs' i
n
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Ha
m
an
o
M
erge
b
r
a
nch
'
j
s
/
w
indows-open-eis
d
ir-err
o
r'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C
Hamano
Merge branch 'jk/colors-fix'
i
nto
m
a
i
n
t
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge bran
c
h 'j
k
/check
o
ut-from-
t
ree' into maint
commit
|
commitdiff
|
tree
2014-12-22
A
lexand
e
r Kules
h
ov
clean: ty
p
ofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
H
a
mano
Git 2
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C Hamano
Sync with v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ham
a
no
Git
2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ha
m
ano
Sync 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
Junio C Hamano
Sync
w
it
h
v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ha
m
ano
Git 1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
S
y
nc wi
t
h v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hama
n
o
Git 1
.
8
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Merg
e
b
r
a
nch 'do
t
g
it-case-maint
-
1
.
8
.
5
'
into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schin
d
elin
fsck: compl
a
in ab
o
ut NTFS "
.
g
it" al
i
ases
i
n
t
r
ees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
ohannes
S
c
hindelin
read-cache: optionall
y
disallo
w
NTFS
.
g
i
t va
r
iants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johanne
s
S
c
hindel
i
n
path: add is_ntf
s
_dotg
i
t() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
K
i
ng
fsck: com
p
lai
n
a
b
out HFS
+
"
.
git" ali
a
ses
i
n
t
rees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
King
read-ca
c
h
e
: o
p
tionally disallow HFS+
.
git variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
utf8: add is_hf
s
_dotgit
(
) he
l
per
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
fsck:
n
otice
.
git c
a
s
e-in
s
ens
i
tively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f K
i
ng
t1
4
50: refactor "
.
"
, "
.
.
", an
d
"
.
git"
f
sck te
s
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
Ki
n
g
verif
y
_dotf
i
le(): reject
.
gi
t
cas
e
-insensiti
v
el
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff K
i
n
g
read-tree: add tests f
o
r confusing paths like "
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
u
n
pack-tre
e
s: pro
p
agate errors adding entries to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff
K
in
g
r
e
ad_
p
a
c
ked_refs:
u
se skip_prefi
x
instead
o
f static
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed
_
r
e
fs
:
pass strbuf to parse_r
e
f_lin
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
J
e
ff King
read_p
a
ck
e
d
_r
e
fs:
u
s
e a s
t
rbuf for r
e
ading l
i
nes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wampler
git-am
.
txt: --ignore-
d
ate fla
g
is not
p
assed
to git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Ju
n
io
C Hamano
Merge branch 'maint' of git://github
.
co
m
/git
-
l10
n
/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Ham
a
no
Start post 2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
J
e
ff
King
for_each_reflog_e
n
t_reverse: turn
l
eftover check into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_reflog_
e
n
t
_
reverse:
f
ix newlines on block
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jef
f
King
push: truly u
s
e "
s
imple"
as
d
e
f
ault, not "upstre
a
m"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Ju
n
io
C
Hamano
Gi
t
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
M
arc B
r
a
nch
a
u
d
RelNotes: spelling
&
g
rammar tweaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mi
k
e Hom
m
e
y
sh
a
1_name:
avoid
u
nne
c
essary
s
ha1 lookup in find_unique_abbrev
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Junio
C
Hama
n
o
Git 2
.
2
.
0-rc
3
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
Jeff
King
t4026
:
test "normal" color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff Kin
g
config: fix parsing o
f
"g
i
t config --get-color
s
ome
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
J
e
ff King
docs: desc
r
ibe ANSI
256-color mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io C Ham
a
no
Mer
g
e
b
ranch 'sv/
s
ubmitting-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C Hamano
Me
r
ge bran
c
h 'sn/tutorial-status-output-example'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io C Hamano
Merge branc
h
'
m
h/
d
oc-remote-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
Hamano
Mer
g
e branch 'tb/n
o
-r
e
l
ative
-
file-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge bra
n
ch 'cc/interpret-tra
i
lers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
gitweb
:
hack ar
o
und CGI's list-cont
e
x
t p
a
ram()
h
a
ndli
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jon
a
than
N
ieder
Makefil
e
: have pytho
n
scripts depend
o
n NO_PYTH
O
N set
t
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Ni
e
der
Makefile:
simp
l
ify by using SCR
I
PT_{PERL
,
SH}
_
GEN macr
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Junio C
Hamano
Me
r
ge
g
it://github
.
com/git
-
l1
0
n/git-po
commit
|
commitdiff
|
tree
2014-11-18
Ju
n
i
o
C Hamano
Me
r
g
e
branch '
j
c/d
o
c
-
com
m
it-only
'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Haman
o
Merge branch 'ta/tutorial-mod
e
rnize'
commit
|
commitdiff
|
tree
2014-11-18
Junio
C Hamano
M
erg
e
branch 'da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t
960[34]:
mark c
v
simport tests as requiring perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff
K
ing
t0
0
90: mark add-in
t
e
ract
i
v
e
test wit
h
P
E
R
L
p
r
erequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jef
f
King
Makefile: ha
v
e per
l
scripts d
e
pend on NO_PER
L
s
e
tti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
M
i
chael Hagg
e
rty
create
_
defaul
t
_files(): don't set u
+
x bit on $GIT
_
D
IR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
J
u
n
i
o C Hamano
M
erge branc
h
'master' of git
:
//github
.
c
o
m/git-l
1
0n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
b
r
ian m
.
carlson
Documen
t
ation: change "gitlink"
t
ypo in git-push
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next