repo.or.cz
/
git
/
mingw.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
Ramsa
y
Jones
Makefile: Replace merge-
f
ile
.
h with merge-blobs
.
h in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Juni
o
C Haman
o
m
erge-tree:
f
ix d/f conflict
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Haman
o
me
r
ge-
t
ree
:
add
comments to clari
f
y what t
h
e
se functions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
J
u
n
io C Hamano
merge-tree: lose u
n
used "
r
esolve_directori
e
s"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
J
un
i
o C Hama
n
o
merge-tree: lose
unused "fla
g
s" from
m
erge_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
Juni
o
C H
a
mano
Which merg
e
_
f
ile
(
) function
d
o you mean?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
Junio C
Ha
m
ano
Merge branch 'mm/s
t
atu
s
-push-
p
ull-ad
v
i
s
e'
commit
|
commitdiff
|
tree
2012-12-04
Matthieu Moy
docu
m
ent th
a
t sta
t
usHints affects git checkout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Hamano
Git 1
.
8
.
1-rc
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
J
u
nio C H
a
mano
Merge branc
h
'mm/sta
t
us-push-pull-advise
'
commit
|
commitdiff
|
tree
2012-12-03
Jef
f
King
status
:
re
s
p
e
c
t
advi
c
e
.
statusHints for ahead/be
h
ind
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio
C Hamano
Update
d
raft release n
o
tes to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
J
u
ni
o
C Hamano
Merge branch 'pw/p4-various-fixes'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hamano
Mer
g
e b
r
anch 'lt/diff-stat-show
-
0
-lin
e
s'
commit
|
commitdiff
|
tree
2012-11-29
Junio C H
a
mano
Merge branch 'fc/
r
emote
-
hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ham
a
no
Merge branch
'
mk/co
m
plete-tc
s
h'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hama
n
o
Merg
e
bran
c
h 'jc/doc-push-sa
t
ellite'
commit
|
commitdiff
|
tree
2012-11-29
Junio C H
a
mano
M
erge branch
'km
/
send-email-re
m
ove-c
r
uf
t
-in-address'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Merge
b
r
an
c
h
'
jk/s
e
nd-email-sender-pr
o
mp
t
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C Hamano
Merge
br
a
n
c
h 'fc
/
sen
d
-email-no-sender-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
Merge br
a
nch
'
er/doc-
a
d
d-new
-
c
o
mmands'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
a
mano
Merge b
r
anch '
j
l/submodule-
r
m'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C H
a
mano
Me
r
ge bran
c
h 'pp/gitweb-config-underscore'
commit
|
commitdiff
|
tree
2012-11-29
Junio C H
a
mano
Me
r
ge branch 'fc/completio
n
-test-simplif
i
cation'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hamano
Merge bra
n
ch
'mai
n
t
'
commit
|
commitdiff
|
tree
2012-11-29
Matthieu Moy
git-fast-import
.
t
xt: improve docum
e
ntation for
quot
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Ma
t
thie
u
Moy
g
i
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
J
unio
C
Hamano
Merge branch 'master' of
git://git
h
ub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Ham
a
no
t4049: refocus tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Felip
e
Cont
r
eras
comple
t
ion: fix warning for
z
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Merge branch
'mas
t
er' of git://github
.
c
o
m/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
J
unio C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C Hama
n
o
Upd
a
t
e dra
f
t
r
el
e
ase n
o
tes to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
ano
Mer
g
e branch 'fc
/
zsh-comple
t
i
on'
commit
|
commitdiff
|
tree
2012-11-28
J
u
nio C Ha
m
a
n
o
Merge branch 'mm/statu
s
-push-
p
ull-advise'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
Merge
br
a
nch 'jk
/
pi
c
k
a
x
e
-
textconv
'
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C Hamano
Start preparing for
1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Jeff King
t9001: check send-email b
e
hav
i
or
with implic
i
t sender
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
Merge
b
r
an
c
h 'rh
/
maint-
g
it
w
e
b-highlig
h
t-ext' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
H
a
m
ano
M
e
rge b
r
anch 'pw/maint-p
4
-rcs-
e
xpansion-newline' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Ralf Th
i
elow
comp
l
etion: add op
t
io
n
s --single-bran
c
h and
--branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C
H
am
a
n
o
Merge branch 'fc/
s
e
n
d-
e
mail-n
o
-sender-prompt' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jeff King
t: add test
s
for "git var"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
J
unio
C
Hamano
Docume
n
t
a
tion/gi
t
-pu
s
h
.
txt: c
l
ari
f
y the "push
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Felip
e
Con
t
re
r
as
remote-h
g
: fix
f
or older ver
s
ions of
p
y
thon
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Felipe Contreras
remote-hg: fix
f
o
r
f
iles
w
i
t
h spac
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio C Haman
o
diff -
-
short
s
tat: do not
c
ount "unme
r
ged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
u
n
io C
H
amano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
aman
o
M
e
r
g
e
bran
c
h 'nd/maint-c
o
mp
a
t-fnmatc
h
-fix' into maint
commit
|
commitdiff
|
tree
2012-11-27
J
unio C
H
a
mano
Merge branch
'jh/update
-
ref-d-through-symref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
J
uni
o
C H
a
m
a
no
M
e
rge branch 'es
r
/maint-doc-fast-impor
t
' into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge
b
r
an
c
h
'wtk/
s
ubmodule-doc-fixup' into maint
commit
|
commitdiff
|
tree
2012-11-27
J
u
n
io C
Hamano
diff --st
a
t:
d
o no
t
count
"
u
nmerged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hama
n
o
diff --stat: move t
h
e "total
coun
t
" logic to
the
l
ast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C
Hamano
diff --stat:
u
s
e
"fi
l
e" te
m
p
o
rary vari
a
ble to refer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Hamano
diff --stat
:
status of
u
n
modif
i
ed pair
in diff-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Haman
o
test: add failin
g
tests
for "di
f
f --stat"
t
o t4049
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Marc Kh
o
uzam
Support for
g
it ali
a
sing for tcsh c
o
mpl
e
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
M
ar
k
S
z
epieniec
Do
c
umenta
t
i
on: improve
p
hrasing in git
-
push
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof M
a
zu
r
git-sen
d
-email:
a
llow ed
i
t inv
a
lid e
m
ail ad
d
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzys
z
to
f
Mazur
git-send-emai
l
: as
k
wha
t
to do wit
h
a
n
i
n
valid em
a
il
.
.
.
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Mazur
g
it-send-em
a
il: remo
v
e
invalid addr
e
sses earlier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-26
Eric S
.
Ra
y
mo
n
d
Doc
u
mentation
:
how
to a
d
d a new
command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Antoi
n
e Pelisse
Fix typo in remote set
-
head usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Felipe Contreras
s
e
nd-email: avoid q
u
estions when us
e
r has an ident
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git p4: remove
unneed
e
d c
m
d initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete
W
yckoff
git p
4
: f
i
x labelDetails typo in
e
xception
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyc
k
off
git
p4 test: di
s
p
lay unresolvable
host error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
P
ete
W
yckoff
gi
t
p4: catch p4 errors
when st
r
eaming file contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
P
ete Wyckoff
g
i
t p
4
: handle servers w
i
tho
u
t move support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git p4:
c
a
t
ch p4 d
e
scribe errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Paul Gortmaker
M
akefile:
hide stderr of c
u
r
l
-config test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
E
nrico Scholz
ema
c
s: ma
k
e
'git-st
a
tus' work w
i
th se
p
a
rate
g
it dirs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Maz
u
r
g
i
t-send-email: fix
fallb
a
ck
code in extract_valid_
a
ddress()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof
Mazur
git-send-email: rem
o
ve garbage a
f
ter ema
i
l address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
U
pdat
e
d
raft release notes to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
man
o
Merge bra
n
ch 'rr
/
s
u
bmodu
l
e-diff-config
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Me
r
ge b
r
anch 'nd/ma
i
nt-comp
a
t-fnma
t
ch-fix'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Me
r
ge b
r
anc
h
'bc/do-not-recurse-in-
d
ie'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'mk
/
complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge
b
ranch 'jh/
u
pdate-ref
-
d
-
throu
g
h-symref'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hama
n
o
M
e
rge bran
c
h
'
lt/dif
f
-stat
-
show-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
io C
H
a
m
ano
Me
r
ge bra
n
c
h 'sg/com
p
lete-help
-
undup'
commit
|
commitdiff
|
tree
2012-11-26
J
unio C Ha
m
a
no
Sync
with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C
Hama
n
o
Gi
t
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Hamano
Merge branch 'jk/c
h
eckout
-
out-of-unborn' into maint
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Haman
o
Merge b
r
anch 'cn/config-mi
s
sing-pat
h
' int
o
maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
ama
n
o
M
erge b
r
anch 'jk/m
a
int-gitweb-xs
s
' int
o
main
t
commit
|
commitdiff
|
tree
2012-11-25
M
a
rc Khouzam
Completion mus
t
so
r
t b
e
fore u
s
ing uni
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-24
J
ens Lehmann
Te
a
c
h
rm to remove s
u
b
m
odules when give
n
with a trailing '/'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
J
u
nio C Ham
a
no
Up
d
ate draft release n
o
tes for
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
Hamano
Merge branch
'
esr/maint-
d
o
c
-fast-import'
commit
|
commitdiff
|
tree
2012-11-21
J
unio C Hamano
Me
r
ge
b
ran
c
h 'wtk/submodule-doc-f
i
x
u
p'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
H
amano
M
erge
br
a
n
c
h
'
so/p
r
ompt-
c
ommand'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
M
e
rge
b
ranch 'j
k
/
con
f
ig-ig
n
ore
-
duplicate
s
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge b
r
anch 'jk
/
maint-http-half-auth-fetc
h
'
commit
|
commitdiff
|
tree
2012-11-21
P
h
il Pennock
g
itw
e
b:
m
a
k
e remote_heads c
o
nfig setting work
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
R
a
msay Jones
remote-curl
.
c: Fi
x
a compil
e
r warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
N
g
uy
ễ
n Thái Ngọc Duy
compat/fnmatch:
fix off-
b
y-on
e
character class's length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next