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
R
a
m
say Jones
Makef
i
l
e
:
Replace mer
g
e-file
.
h with merge
-
blobs
.
h
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
m
e
rge-tree: fix d
/
f
co
n
flic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C
Hamano
m
erge
-
t
ree: add comment
s
to clarify what t
h
ese funct
i
o
ns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merge-tre
e
: lose unused "resolv
e
_directories"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Juni
o
C Hamano
merge-tree
:
lo
s
e unus
e
d "flags
"
f
r
om merge_
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
Junio C Ha
m
ano
Whic
h
merge_file()
funct
i
on do y
o
u
mean?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
J
u
nio C Hama
n
o
Merg
e
branch '
m
m/status-pus
h
-pull-
a
dvise'
commit
|
commitdiff
|
tree
2012-12-04
Matthieu
Moy
doc
u
m
e
nt
that sta
t
usHints affec
t
s git
c
heckout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Hamano
G
it 1
.
8
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Junio
C
H
a
m
an
o
Me
r
ge branch
'
mm
/
stat
u
s-push-pull-advise'
commit
|
commitdiff
|
tree
2012-12-03
Jeff King
status: re
s
pect a
d
v
i
ce
.
statu
s
Hints for ahead/behind
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
J
unio C
H
am
a
no
Upda
t
e draft release notes
t
o
1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Ham
a
no
M
e
rg
e
branch 'pw/p4-various-fixes'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
er
g
e bran
c
h 'lt/
d
iff-stat
-
show-
0
-lines'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Merge
b
ra
n
ch
'
fc/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Haman
o
M
e
rge branch 'mk/com
p
lete
-
tcs
h
'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Hamano
Merge branch 'jc/doc-push-sat
e
llite'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Hamano
M
e
rge branch 'km/se
n
d-emai
l
-remove-cruf
t
-
in-addre
s
s'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
M
erge branch 'jk/send-
e
mail-sender-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
Merge bra
n
ch 'fc/send-email
-
no-
s
ende
r
-prompt
'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C H
a
mano
Merge branch 'er
/
d
o
c-add-ne
w
-commands'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge bra
n
ch 'jl
/
submodule-rm
'
commit
|
commitdiff
|
tree
2012-11-29
J
u
n
io C Hama
n
o
M
e
rge branch 'pp/gitweb-confi
g
-
u
nderscore'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
a
m
ano
Merge branch '
f
c/completi
o
n-test-simplification'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-29
Matthieu Moy
git-fast-import
.
txt
:
i
m
p
r
o
v
e document
a
tion
for quoted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Matthieu Moy
git-remo
t
e
-
m
ediawiki: escape ", \, and
LF in file na
m
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'master' of git://github
.
co
m
/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
aman
o
t4049: r
e
focus tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Felipe Con
t
reras
comple
t
io
n
: fix warning f
o
r
z
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Hamano
M
e
r
g
e branch 'm
a
ster' of git://git
h
ub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-28
Junio
C Hamano
Update draft release note
s
to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge branch
'
f
c
/zsh-compl
e
tion'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
H
a
mano
Merge branch 'mm/status-push-pul
l
-advise'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Hamano
Merge branch 'jk/pickaxe-tex
t
conv
'
commit
|
commitdiff
|
tree
2012-11-28
J
u
n
i
o C
H
amano
S
t
a
rt preparing
f
or 1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
J
e
ff King
t9
0
01: check
se
n
d-email
b
ehavior w
i
t
h
im
p
l
i
cit sender
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
J
u
nio C Ha
m
an
o
Merge b
r
an
c
h
'rh/ma
i
nt
-
g
i
tweb-hi
g
hlig
h
t-
e
xt' into mai
n
t
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge
bra
n
ch 'p
w
/maint-p4-rcs-expansion-newline' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Ralf Thielo
w
completion:
add options --single-branch and
-
-branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hamano
Merge branch 'fc/send
-
emai
l
-no-sender-pr
o
mpt'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
J
e
ff King
t: add
t
ests
f
or
"
g
i
t var"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
H
amano
Documentation/gi
t
-push
.
txt: clar
i
fy the "pu
s
h fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Felipe Contreras
remote-hg: fix
for
older versions of python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Felip
e
Contrera
s
remot
e
-hg:
fix for file
s
with spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ha
m
an
o
dif
f
--shorts
t
a
t
: do not count "unmerged"
entr
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
am
a
no
Merge branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
i
o C Haman
o
Merge branc
h
'nd/maint-compa
t
-fnmat
c
h-fix'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge branch '
j
h/update-ref-d-through
-
s
y
m
ref
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Hamano
Merge branch 'es
r
/main
t
-doc-
f
ast-impor
t
'
in
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge bra
n
ch 'wtk/submodu
l
e-doc
-
fi
x
up' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-11-27
Junio C
Hamano
d
iff
-
-stat: do not count
"
u
n
merged" e
n
t
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
u
n
io C
H
amano
dif
f
--stat: move the "to
t
al c
o
unt" logic
to the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ham
a
n
o
diff -
-
st
a
t: use "file" t
e
m
p
orary variab
l
e to refer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
d
i
f
f -
-
stat: sta
t
us of
u
nmodified pair in di
f
f-q
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io
C H
a
mano
te
s
t: add
f
ailing tests
f
or "diff --stat" to t4049
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Marc Khouz
a
m
Supp
o
rt f
o
r gi
t
a
li
a
sing for tcsh comple
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
M
ar
k
Sze
p
ieniec
Documentation: imp
r
ov
e
phrasing in g
i
t
-push
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Maz
u
r
git-send
-
email:
a
llow
e
dit
i
nvalid email address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Mazur
git-sen
d
-email: ask what to do wit
h
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
Krzysztof
M
azu
r
git-
s
end-em
a
il: remove
i
n
valid
addresses
e
arlier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2012-11-26
Eric S
.
R
a
ym
o
n
d
D
o
c
u
ment
a
tion: how to add a new command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
An
t
oine
Pelisse
Fix typo in r
e
mote set-
h
ead
usag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Feli
p
e
Contreras
send-emai
l
: avoid quest
i
ons when user has
a
n ident
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wycko
f
f
g
i
t
p
4
:
remove u
n
nee
d
ed cmd in
i
tializa
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
g
i
t p
4
:
fix label
D
etails typo in exception
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
P
ete Wyckof
f
git p4 test
:
displa
y
un
r
e
solvable host error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
P
ete Wyckoff
g
it p4: catch p4 er
r
ors w
h
en streaming file contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete
W
yck
o
ff
git p4: handle
s
ervers wit
h
out move support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
P
ete Wyckoff
git p4:
c
a
tch p4
describe errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Paul Gortmaker
Makefi
l
e
:
hide stde
r
r o
f
curl-confi
g
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Enri
c
o
Schol
z
emac
s
: make 'git-status' work wit
h
separate
g
i
t d
i
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Mazur
git
-
send
-
e
m
ail:
fix fal
l
back
c
o
de in extract_val
i
d_
a
d
dress(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Mazu
r
git-send-email: remove garbage after email address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
a
n
o
Update draf
t
rel
e
ase no
t
es to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge bran
c
h 'rr/s
u
bmo
d
u
l
e
-diff-config'
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
io C Ha
m
a
n
o
M
e
rge branch 'nd/main
t
-compat-
f
nmatch-
f
i
x
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
mano
Merge branch
'
b
c/d
o
-not-recurs
e
-
i
n-die'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
Hamano
M
e
rge branch 'm
k
/comp
l
ete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Ha
m
an
o
Mer
g
e
b
r
anch
'
jh/
u
p
d
a
te-ref-d-throu
g
h-symref'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge br
a
n
ch 'lt/diff-stat-sh
o
w-0-
l
in
e
s'
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C Hamano
Merge branch '
s
g/com
p
lete-help-undup'
commit
|
commitdiff
|
tree
2012-11-26
J
unio C
Hamano
Sync with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
amano
Git 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
unio C
Ha
m
ano
M
e
rge branch
'j
k
/che
c
k
out-ou
t
-of-unborn'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2012-11-26
J
u
ni
o
C
Ha
m
ano
Merge branch 'cn
/
c
o
nfig-missing-path' into maint
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C H
a
mano
M
e
r
ge branch 'jk/ma
i
n
t-gitwe
b
-xss' into maint
commit
|
commitdiff
|
tree
2012-11-25
Marc
K
h
ouza
m
C
o
mpletion must s
o
rt before using u
n
iq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-24
Jens Lehmann
Teach rm t
o
r
e
move submodules w
h
e
n
given with a tr
a
ilin
g
'/'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Up
d
a
te draft release notes for 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
Hamano
Merge branc
h
'esr/ma
i
nt-doc-fast-im
p
ort'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Ham
a
n
o
Merge b
r
anch 'wtk/s
u
bmodul
e
-d
o
c-
f
ixup'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge bran
c
h 'so/pro
m
pt-command'
commit
|
commitdiff
|
tree
2012-11-21
J
u
nio C Hamano
Merge branch 'jk/conf
i
g
-ignor
e
-d
u
plica
t
es'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
H
a
mano
Merge b
r
anc
h
'jk/maint-http-half-auth-fet
c
h'
commit
|
commitdiff
|
tree
2012-11-21
P
h
il Pennock
gitweb:
m
ake re
m
ote_heads co
n
fig setting work
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Ramsay Jone
s
remote-curl
.
c: Fi
x
a compiler warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Nguyễ
n
T
h
á
i Ngọc Duy
compat/fnmat
c
h: f
i
x
off-by-
o
ne c
h
a
racter class's
l
ength
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next