repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: handle FETCH_HEAD internally
2015-04-29
Junio C Hamano
mer
g
e: h
a
ndle
FETCH_HE
A
D
i
nterna
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: decide
if w
e
auto-generate th
e
message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: make collect_parents() auto-generate the
m
er
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merg
e
: extract prepare_me
r
ge_messa
g
e() log
i
c out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ham
a
no
merge: narrow scop
e
of m
e
rge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
a
no
m
e
r
g
e: split reduce_parents() ou
t
of co
l
le
c
t_pare
n
ts()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge: clari
f
y collect_parents() lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
m
er
g
e
:
small leakfix and code simplif
i
cation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
mer
g
e: do n
o
t
c
heck argc to determine
n
umber of
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C H
a
ma
n
o
me
r
ge: clarify "p
u
l
l
ing i
n
to void
"
s
p
ecial
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
t
5520:
t
est pulling an oc
t
op
u
s into an un
b
orn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t55
2
0: style
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
am
a
no
merge: simpl
i
fy code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: test the top-le
v
el
m
e
rge
d
r
iver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Git 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o C Hamano
Merge
branch 'jk/read-pac
k
ed-ref
s
-without
-
path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch 'mg/
a
d
d
-ignore
-
errors' in
t
o main
t
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io
C
Hamano
Me
r
ge
b
ranch '
m
h/find-uniq-abbrev' into
m
aint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Me
r
ge b
r
anch 'jk/app
r
ox
i
date-a
v
oid-y-d-m
-
over-f
u
ture
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Hamano
Merge branch
'
rw/ap
p
l
y
-does-not
-
ta
k
e-ignore-date' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C
H
amano
Merg
e
branch 'jk/for-
e
a
c
h-reflog
-
ent-
r
ever
s
e' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge branch 'mai
n
t-2
.
1' into m
a
int
commit
|
commitdiff
|
tree
2015-01-07
J
unio
C Hamano
Merge branc
h
'
m
aint-
2
.
0' into ma
i
n
t
-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
J
un
i
o C Hamano
Merge
b
ranch 'maint-1
.
9' into
maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Haman
o
Mer
g
e branch 'm
a
int-1
.
8
.
5' into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
unio C Hama
n
o
Merge branch 'jk/dotgit-cas
e
-
m
a
int-1
.
8
.
5'
into maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
J
e
ff King
is_hfs_dotg
i
t: loosen over-eager
match of
\u{
.
.
4
7
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Prepare f
o
r 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
M
e
rg
e
b
r
anch 'jk/rebuild-perl-scrip
t
s-with-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hamano
M
erge branch 'jk/no-perl
-
tests
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hama
n
o
M
e
rge branc
h
'
p
o
/
e
v
e
r
yd
a
y-doc'
i
nto maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
am
a
no
Merge branch 'j
k
/p
u
sh
-
simple' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio
C H
a
mano
Merge br
a
n
c
h 'mh/config-fli
p
-xbit-back-aft
e
r-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk
/
gitw
e
b-wit
h
-newer-cgi-m
u
l
ti-pa
r
am
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hamano
Merge b
r
anc
h
'rs/receive-pack-use-labs'
i
nto maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
Merg
e
branch 'rs/main
t
-con
f
ig-use-lab
s
' into maint
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hamano
Merg
e
branch 'js/windows
-
open-eis
d
ir-error' in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge bran
c
h
'
jk/colo
r
s-f
i
x' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o
C
Hamano
Mer
g
e branch 'jk/checkout-from-tree' into maint
commit
|
commitdiff
|
tree
2014-12-22
Alexander Kules
h
o
v
clean: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
unio 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 H
a
mano
S
ync with
v
2
.
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
Jun
i
o C Hamano
Sy
n
c with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git
2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
unio
C
Ham
a
no
Sync
w
i
t
h v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
C Hamano
Gi
t
1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hama
n
o
S
y
nc wit
h
v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C Ha
m
ano
G
i
t 1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
a
mano
M
erge branch 'do
t
gi
t
-ca
s
e-m
a
int-1
.
8
.
5'
into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
fsck: complain about NTFS "
.
git"
a
liases in tree
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
read-cache: op
t
i
o
nally disal
l
ow N
T
FS
.
git variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
ohannes Schindel
i
n
path: add i
s
_ntfs_
d
o
t
git() help
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck: complain about HFS+ "
.
git"
a
l
i
ases in tre
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f King
read-cache
:
optionally disa
l
low
H
F
S
+
.
git variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff K
i
ng
utf8: add is_
h
fs_dotgi
t
() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff
K
ing
fs
c
k: noti
c
e
.
git c
a
se-insensitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t1450: refactor "
.
"
,
"
.
.
", and "
.
git"
f
sck tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff
K
ing
v
erify
_
dotfile
(
):
r
eject
.
git c
a
s
e
-insensitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
r
e
ad-tre
e
: add tests f
o
r confus
i
ng paths like
"
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
u
npack
-
trees: propaga
t
e errors addi
n
g e
n
tries
to
t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Je
f
f King
read_pa
c
k
e
d_refs: use skip_prefix instead of
s
tatic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
J
e
ff
K
ing
read_packed_ref
s
:
pass strbuf to
pars
e
_ref_l
i
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Je
f
f Kin
g
read_
p
ack
e
d_ref
s
: use a strbuf for r
e
ading line
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wampler
git-
a
m
.
txt: --ignore-date fl
a
g is not
pas
s
ed to git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Junio
C Ha
m
ano
Merge b
r
a
n
ch 'm
a
in
t
' of
g
it
:
//github
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hama
n
o
St
a
rt
po
s
t 2
.
2 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Je
f
f
King
f
or_each_r
e
flog_ent
_
rev
e
rse: turn leftover c
h
eck into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jef
f
King
for_e
a
ch_reflog_ent_r
e
verse: fix
n
e
wlines on block
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
Jeff King
pus
h
: truly
use
"sim
p
l
e" as defaul
t
, not "up
s
trea
m
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Jun
i
o C Hamano
G
i
t 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Ma
r
c Branchaud
R
e
lNotes: spel
l
ing & grammar t
w
eaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mike Ho
m
mey
sh
a
1_na
m
e:
avoid unnecessar
y
sha1 lookup
in find_unique_
a
bbrev
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Haman
o
Gi
t
2
.
2
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Michael J
Gruber
ad
d
: ignore only ignored fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jef
f
King
t402
6
:
test "norm
a
l
" color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
config: fix
parsi
n
g of "git config -
-
get-color s
o
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
docs
:
d
e
scrib
e
ANSI
2
5
6-
c
olor mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o C Ham
a
no
M
e
rge
b
r
a
n
ch 'sv
/
submitt
i
ng-fina
l
-
p
a
tch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge
b
r
a
n
c
h
'
s
n/tutorial-
s
tatus-outpu
t
-example'
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C Hamano
Merge br
a
nch
'
mh/
d
oc-remote
-
helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch 'tb/
n
o-rel
a
ti
v
e
-file-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch
'cc
/
int
e
r
p
ret-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
g
i
t
web: hack around CG
I
's list-context param() ha
n
d
ling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nie
d
er
Makefile: have pytho
n
s
cripts dep
e
nd on
N
O
_
PYTHO
N
set
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonat
h
an Nie
d
e
r
Makefile: simplify by using
S
CRIPT_
{
PERL,SH}
_
GEN
macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge
gi
t
://github
.
com/git-l1
0
n/git-po
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio C Hamano
Merge branch 'jc/doc-commi
t
-
o
nl
y
'
commit
|
commitdiff
|
tree
2014-11-18
Junio C
Haman
o
Merge
b
ranch 'ta/tutorial-modern
i
ze'
commit
|
commitdiff
|
tree
2014-11-18
J
unio C
H
am
a
no
M
e
rge branch 'da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t960[
3
4]: mark cvsimp
o
r
t
t
ests as requiring perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
J
eff
King
t
0
090: mark a
d
d-interact
i
ve tes
t
wi
t
h PERL p
r
erequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jef
f
King
Makefile:
have
p
erl
s
cript
s
depend on NO_PERL
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Michael Haggert
y
crea
t
e_def
a
ult_files
(
)
:
do
n
'
t
s
et u+x
bit on
$GIT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
Junio C
H
amano
Merge
b
r
an
c
h 'master' o
f
g
it:
/
/
githu
b
.
com/g
i
t-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
brian
m
.
carlson
Docu
m
e
n
ta
t
ion: ch
a
nge
"
gitlink" typo in git-push
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
René
S
charfe
use labs() for v
a
riable
s
o
f
type long instead of a
b
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
R
e
né Scharfe
use labs()
f
or variables of type long
i
nstead of
a
b
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-17
Joh
a
nnes Sixt
W
i
ndows: correct detection of EIS
D
IR in mingw_
o
p
en()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-14
David Agui
l
ar
difftool: honor
--trust-exit-code for builtin tools
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next