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
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
2013-01-22
Ramsay Jon
e
s
M
a
k
e
fil
e
: Re
p
lace merge-file
.
h with merge
-
blob
s
.
h
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
m
erge-tree: f
i
x d/f confli
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio
C Hamano
me
r
ge
-
tr
e
e: add comments to c
l
arify what
these functi
o
n
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Jun
i
o C Hamano
merge-tr
e
e: lo
s
e unused "resolve_directo
r
ies"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio C
H
ama
n
o
mer
g
e
-tree:
l
o
se unu
s
e
d
"
f
lags"
from merge_list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-10
Ju
n
io C Hama
n
o
W
h
ich merge
_
fi
l
e() function do you mean?
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-04
Juni
o
C Hamano
Merg
e
branch
'mm/stat
u
s-push-pu
l
l-advise'
commit
|
commitdiff
|
tree
2012-12-04
Ma
t
thieu
Moy
d
o
c
u
men
t
that statusHi
n
ts affects git
c
heckout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Ha
m
ano
Git 1
.
8
.
1-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Hamano
Merg
e
branch 'mm/status-push-pull-advis
e
'
commit
|
commitdiff
|
tree
2012-12-03
Jeff
King
statu
s
: respect adv
i
ce
.
statu
s
Hints for ahe
a
d/behind
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Update draft r
e
lease notes to
1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C
H
amano
Merg
e
bra
n
ch 'pw/p4-v
a
r
ious-fix
e
s'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
erge branch 'lt/diff-stat-s
h
ow-
0
-
lines'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C
Hamano
Mer
g
e br
a
nch 'fc/remote-h
g
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Mer
g
e
bran
c
h 'mk/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Hamano
Merge bra
n
ch '
j
c
/
doc-push-satelli
t
e'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merg
e
branch 'km/
s
end
-
email
-
remove-
c
ruft
-
in-addre
s
s'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Haman
o
Merge branc
h
'
j
k
/
send-email-sender-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'fc/send-e
m
a
il-no-sender-
p
rompt
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hamano
Mer
g
e b
r
anch 'er/doc-add-new-commands'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Mer
g
e b
r
anch
'
jl
/
sub
m
o
dule-rm'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hama
n
o
M
e
rge branch 'pp/gitweb
-
c
o
nfig-underscore'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Ha
m
ano
Merge branch 'fc/completio
n
-test-
s
i
m
plification'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-29
Matthieu Moy
git-fa
s
t-import
.
t
xt:
improv
e
documentation for quote
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Matthieu
Moy
git-remote-mediawiki: escape
"
, \, and LF in file names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hama
n
o
M
e
rge br
a
n
c
h 'mas
t
er' of git:/
/
github
.
c
o
m
/
g
it-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio
C
Haman
o
t4049: refocus tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Felipe Contreras
complet
i
on: fix warnin
g
for zsh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Junio C Haman
o
Merge branch 'master'
of
gi
t
://gi
t
hub
.
com/git-l1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2012-11-28
J
u
ni
o
C Hamano
U
p
date draft r
e
l
e
ase
notes to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C Ha
m
ano
M
erge bran
c
h
'fc/zsh-completi
o
n'
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Ha
m
ano
Merge branch 'mm/status-push-pull-advise
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ham
a
no
Me
r
ge branch
'
j
k/pickaxe-textconv'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Haman
o
Start preparing f
o
r
1
.
8
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Jeff
K
i
ng
t900
1
: check sen
d
-e
m
ail behavior with
i
m
plicit
s
ender
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
ano
Merge b
r
anch '
r
h/maint
-
gi
t
w
e
b-
h
ighlight-ext
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-11-28
Junio
C Hamano
Merge
branch 'p
w
/maint-p4-
r
cs-e
x
pansion-ne
w
line' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Ralf Thiel
o
w
completion: a
d
d
options --singl
e
-
b
ranch
a
nd
-
-
b
ranch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Haman
o
Merge branch '
f
c/sen
d
-email-no-sender-prompt'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jef
f
K
i
ng
t:
add
t
ests for "git
v
ar"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
D
o
cument
a
t
i
on/git-pus
h
.
txt: clarify t
h
e "push from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Felipe Contreras
remote-hg: fix
f
o
r o
l
der versions of python
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Felipe Contreras
remote-hg: fix for fil
e
s
wit
h
spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Ha
m
ano
d
i
f
f
--shortstat: do not
co
u
nt "unm
e
r
g
ed" entrie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio C Hamano
Merge branch 'nd/maint-c
o
mp
a
t-fnmatch-fix' into maint
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Hamano
Merge
branch 'jh/update-ref-d-through-symref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Hamano
Merge branch
'esr/maint-doc-fast-import'
i
n
to maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Me
r
ge b
r
anch 'wtk/submo
d
ule-doc-fixup' in
t
o
maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ham
a
no
diff --stat
:
d
o
n
ot count "unmerge
d
"
ent
r
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --stat:
m
ove
the
"total
c
ount" logic to the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --stat: use "file" temporar
y
va
r
i
able to refer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio
C
H
a
m
ano
diff
--sta
t
: s
t
atus
o
f
unmodified
p
ai
r
in diff-q is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
t
e
s
t: add faili
n
g
tes
t
s f
o
r "diff
--st
a
t" to t4049
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
M
a
rc K
h
ouzam
Support for git aliasing for tcsh completion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Ma
r
k S
z
e
pieniec
Docu
m
ent
a
tion: impr
o
v
e
phrasi
n
g in git-p
u
sh
.
t
xt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Krzy
s
zt
o
f M
a
zur
git-send
-
email: a
l
low edit invalid
e
m
a
il address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Mazur
g
i
t-send
-
email:
ask what to d
o
w
ith an
invalid
email
.
.
.
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Kr
z
yszto
f
Mazur
git-send-
e
mail: remove in
v
alid a
d
dresses ear
l
ier
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hama
n
o
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2012-11-26
Er
i
c
S
.
Raymond
Documenta
t
ion: how t
o
add a new command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Antoine
Pelisse
Fix typo in rem
o
te set-head u
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Fe
l
ipe Contrer
a
s
s
end-email: a
v
o
id qu
e
s
t
ions whe
n
user has an ident
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wy
c
koff
git
p
4
: remove unneed
e
d cmd initiali
z
atio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git
p4: fix
la
b
elDetail
s
typo in
except
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete
Wycko
f
f
git p4 test:
d
isplay unresolvable
h
ost
err
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
g
i
t
p4:
c
atch p4 errors whe
n
s
treaming file cont
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wycko
f
f
git p4: handle server
s
w
ithout move
s
u
p
port
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git p4:
catch p4 describe errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Paul Gortmaker
M
a
kefile: hi
d
e std
e
rr of curl-confi
g
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Enrico
S
cholz
em
a
cs
:
make '
g
it-status' work
w
ith
separate git
d
irs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Krzysz
t
of Mazur
git-se
n
d-email: fix
fallback code in e
x
tract_val
i
d
_
ad
d
ress(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
K
r
zysztof M
a
zur
g
i
t-s
e
nd-email:
remove garb
a
ge after
email address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
ano
Update
draft release notes to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o
C
Hamano
Merge branch 'rr/submodule-diff-config'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
n
o
Mer
g
e branch 'nd/maint-compat-fnmatch-fix'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
M
e
rge branch 'bc/do-not-recu
r
s
e-in-die'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge b
r
anch '
m
k
/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C Ha
m
ano
Merge branch 'jh/update-ref-d-throu
g
h-symref'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
H
amano
Merge branc
h
'lt/di
f
f-stat-show-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
H
a
mano
Merge branch 'sg/complete-help-undup'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
am
a
no
Sync
w
ith 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Hamano
Gi
t
1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'jk/checkout-out-of-unborn' into maint
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
io C Hama
n
o
Merge branch 'cn/config-m
i
s
si
n
g
-pat
h
' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-11-26
J
u
ni
o
C
Hamano
M
erge bra
n
ch 'jk/
m
a
i
nt-gi
t
web-xss' into maint
commit
|
commitdiff
|
tree
2012-11-25
M
arc Khouzam
C
omp
l
etion must
s
ort b
e
fore us
i
ng
u
ni
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-24
J
e
ns Lehmann
Teach
r
m to remove
s
ub
m
odules when g
i
ven with a trailin
g
'/
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
Ha
m
ano
U
p
date dra
f
t release n
o
t
e
s for 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
Juni
o
C
H
am
a
no
Merge branch 'esr/
m
aint-doc-
f
a
s
t-import
'
commit
|
commitdiff
|
tree
2012-11-21
Jun
i
o C Hamano
Merge branch '
w
tk/sub
m
od
u
le-d
o
c-fi
x
up'
commit
|
commitdiff
|
tree
2012-11-21
Jun
i
o C Hamano
Merge
branch 'so
/
p
r
omp
t
-
c
ommand'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
M
erge branch 'jk/config-ignore-duplicates'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C Ham
a
n
o
Merge
branch 'jk/maint-http-half-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-21
Phil Pennock
gitweb: make remote
_
heads config setting
w
ork
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
Ramsay
J
on
e
s
remote-cur
l
.
c
:
Fi
x
a compiler warnin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Nguyễn
T
h
ái Ngọc Duy
c
ompat/fnmatch: fi
x
off-by-one
c
haracter class's length
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next