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-tree: fix d/f conflicts
2012-12-26
J
u
nio C Ham
a
no
m
e
rge-tree: fix d/f con
f
lict
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Ju
n
i
o
C Ha
m
a
n
o
mer
g
e
-
tree: add commen
t
s
t
o
clarify what these
f
unc
t
ions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merge-tre
e
: lose
unus
e
d "resolve_
d
irectorie
s
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
J
u
nio C Hamano
merg
e
-t
r
ee: lose un
u
sed "flags" from merge_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
Ju
n
io
C
Ha
m
a
no
Which me
r
g
e
_fi
l
e() func
t
i
on
do you
mean?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
J
u
n
i
o C Ham
a
no
Merge b
r
anch 'm
m
/status-push-pu
l
l
-advis
e
'
commit
|
commitdiff
|
tree
2012-12-04
Matthieu Moy
document
t
hat s
t
a
t
usHint
s
affects git che
c
kout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
J
uni
o
C Hamano
Git 1
.
8
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Ha
m
ano
Merge branch 'mm/status-push-pu
l
l-ad
v
ise'
commit
|
commitdiff
|
tree
2012-12-03
Je
f
f
King
st
a
tus: resp
e
ct advice
.
s
t
atusHints fo
r
a
h
ead
/
behind
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
U
p
date draft re
l
ease no
t
e
s
t
o
1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
e
rg
e
branch 'pw
/
p4-various-fixes'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C
Hamano
Merge branch 'lt/diff-stat
-
sho
w
-0-
l
ines'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge bran
c
h 'fc/
r
emot
e
-h
g
'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Merge branch 'mk/comple
t
e-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
ano
Merge br
a
nch 'j
c
/
d
oc-pus
h
-satellite'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge
bra
n
ch '
k
m/send-email
-
remove-cruft-in-address'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
a
mano
Merge
branch '
j
k/send-ema
i
l-sender-prompt'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C H
a
mano
M
e
rg
e
br
a
nc
h
'fc/s
e
nd-email-no
-
sender-prom
p
t'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
erge branch 'er/doc
-
add-ne
w
-command
s
'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C
Hamano
M
erge bran
c
h 'jl/su
b
m
odule-rm'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hamano
Merge branch 'pp/gitweb
-
confi
g
-
underscore'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'fc/completio
n
-t
e
st-
s
implification'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
Merge
bra
n
c
h
'maint
'
commit
|
commitdiff
|
tree
2012-11-29
Matth
i
eu Moy
git-
f
ast
-
import
.
txt: improve docume
n
tat
i
on
f
or q
u
ote
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
M
atth
i
eu Moy
gi
t
-remote-
m
ediawiki: escape ",
\
, and
LF in file names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
Merge b
r
anch
'
m
aster'
of git://gith
u
b
.
com/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ham
a
no
t4049:
r
ef
o
cu
s
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
F
elipe Contreras
c
o
m
pletion: fix
w
arnin
g
f
or zsh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
a
m
a
no
Merge branch 'master' o
f
g
it://github
.
com/g
i
t-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
J
u
nio C
Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C
Haman
o
U
p
date
dr
a
ft release no
t
e
s t
o
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C Hamano
Merge branch
'
fc/zsh-c
o
mpl
e
ti
o
n'
commit
|
commitdiff
|
tree
2012-11-28
J
u
n
i
o
C Hamano
Merge bran
c
h 'mm/statu
s
-
p
ush-p
u
l
l
-advise'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Haman
o
Merge branch 'jk/pi
c
kaxe-textconv'
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C Ha
m
ano
S
t
art
p
reparing for
1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Jeff Ki
n
g
t900
1
:
check send
-
email be
h
avior with implicit
sender
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge br
a
nch 'rh/maint-gitw
e
b-highlight-ext'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-11-28
Junio C
H
amano
M
erg
e
branch 'pw/maint-p4-rcs-
e
xpa
n
sion-ne
w
line'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
R
a
lf Th
i
elow
completion: add opt
i
o
n
s --
s
ingle-branch and --bra
n
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
M
e
r
g
e branch 'fc/
s
e
nd-email-no-
s
ender-prompt'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jeff
K
ing
t
:
add test
s
for "
g
it var"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
D
o
c
ume
n
tat
i
on/git-push
.
t
x
t:
cl
a
rify the "push from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Felipe C
o
ntreras
rem
o
te-hg: fix
f
or old
e
r
v
ersions of
p
y
th
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Felipe Con
t
reras
remote-hg: fix for files with
s
p
aces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --sh
o
rtstat: do not
count "unmerged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio
C Ha
m
ano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2012-11-27
Junio C
Haman
o
Merge
b
ranch 'nd/maint-com
p
at-fnmatch-fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-27
J
unio C Hamano
Merge branch 'jh/up
d
ate-re
f
-d-through-symre
f
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ha
m
ano
Merge branc
h
'esr/
m
aint-d
o
c
-
fast-import' in
t
o
maint
commit
|
commitdiff
|
tree
2012-11-27
J
unio C Hamano
Merg
e
branch 'wt
k
/submodule-
d
oc-f
i
xup
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Haman
o
diff --stat:
do not co
u
nt "unmerge
d
" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Hamano
diff --stat:
move the
"tota
l
count
"
l
o
gic to the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
unio C
H
amano
diff --
s
tat: use "fi
l
e"
t
emporary variabl
e
to refer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
di
f
f --s
t
at: sta
t
us o
f
unmodifi
e
d
p
air in diff-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o
C
H
a
m
a
no
te
s
t
: add fail
i
ng t
e
s
ts for "diff --stat
"
to t
4
049
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Marc Khouzam
Support for git al
i
asing for tcs
h
c
o
mplet
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Mark Sz
e
pieniec
Documenta
t
io
n
: improve phrasing
i
n git-
p
ush
.
t
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof M
a
z
ur
gi
t
-send-em
a
i
l: allow edit invalid
e
mail addr
e
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Kr
z
ysztof Mazur
git-send-email: ask what
to
do wi
t
h an i
n
valid e
m
ail
.
.
.
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzyszt
o
f
M
a
zur
git-send-email: remove invalid
a
ddres
s
e
s ear
l
ier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2012-11-26
Eri
c
S
.
R
a
y
mond
Do
c
umentation: how
t
o
a
dd a new command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Antoine Pelisse
F
ix typo in r
e
mote s
e
t-head usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
F
e
lipe Contreras
sen
d
-em
a
i
l
: a
v
oid questions when user has an ident
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wy
c
k
off
git p4: remo
v
e unneeded cmd initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyc
k
off
g
it p4: fix
labe
l
Details
typo in
e
xc
e
p
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
gi
t
p4
test
:
di
s
p
lay unresolva
b
le host error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
P
ete W
y
ckoff
git
p
4:
c
atch p4
e
rrors
when stre
a
m
i
ng file
c
onte
n
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
P
ete Wyckof
f
git p4: ha
n
dle serv
e
rs wi
t
ho
u
t
move support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git p4
:
cat
c
h p4 desc
r
ibe er
r
o
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Paul Gortmaker
Makefile: hide
stder
r
of curl-config test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Enr
i
co Schol
z
emacs
:
make 'git-status' work wit
h
s
ep
a
rate git dirs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
K
rzysztof
M
azur
git
-
s
end-email
:
fix
f
all
b
ack
co
d
e
in ext
r
act_valid_a
d
d
r
ess()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Mazur
g
i
t-send-e
m
ail:
rem
o
ve
g
arba
g
e after email addr
e
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
unio C Hamano
Update dr
a
ft release
notes to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
M
e
rg
e
branch 'rr/submodule-diff-co
n
fig'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge
branch '
n
d/maint-compat-fn
m
atch
-
fix'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
amano
Merge
branc
h
'bc/do-n
o
t-recurse-
i
n-d
i
e'
commit
|
commitdiff
|
tree
2012-11-26
J
unio
C
Hamano
Merge b
r
anch 'mk/comple
t
e-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge
b
r
anch
'
jh/up
d
a
t
e-
r
ef-d-th
r
ough-symref'
commit
|
commitdiff
|
tree
2012-11-26
J
u
ni
o
C Hamano
Mer
g
e branch
'lt/
d
iff-stat-s
h
ow-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branc
h
'sg/comp
l
ete-h
e
lp-
u
ndup
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
no
Sync wi
t
h 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
man
o
Git
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Hama
n
o
Merge branc
h
'jk/checkout-out
-
of-u
n
b
orn' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C H
a
mano
Merge branc
h
'cn/config-mi
s
sing-path' into maint
commit
|
commitdiff
|
tree
2012-11-26
J
un
i
o C H
a
mano
Merge br
a
n
ch 'jk
/
maint-gitweb-xss' into maint
commit
|
commitdiff
|
tree
2012-11-25
Marc Khouzam
Com
p
letion must sort before using u
n
iq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-24
J
e
ns Lehm
a
nn
Teach
r
m t
o
rem
o
ve submod
u
les wh
e
n given
w
ith a trailing '/'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Upd
a
te
dr
a
ft rel
e
ase notes for 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
J
unio C Hamano
M
e
rge br
a
nch 'esr/maint-doc-f
a
st-i
m
port'
commit
|
commitdiff
|
tree
2012-11-21
Ju
n
io C Hamano
Merge branch 'wt
k
/submodu
l
e-doc-fix
u
p'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
Ham
a
no
Merge branch 'so/prompt-command
'
commit
|
commitdiff
|
tree
2012-11-21
Ju
n
io C H
a
mano
Merge
b
ranch 'jk/config-ignore-duplicat
e
s'
commit
|
commitdiff
|
tree
2012-11-21
Ju
n
i
o C H
a
m
a
no
Merge br
a
n
c
h 'jk/maint-http-
h
alf-auth-fet
c
h'
commit
|
commitdiff
|
tree
2012-11-21
Phil Pen
n
o
c
k
g
i
tw
e
b: ma
k
e
remote_h
e
ads config setting wor
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
R
a
ms
a
y
J
ones
remote-curl
.
c: Fix a compil
e
r warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Nguyễn Thái Ngọc
Duy
compat/f
n
mat
c
h: fix off-by
-
on
e
character cl
a
ss's length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Hama
n
o
S
ixth bat
c
h for 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next