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
git-merge documentation: more details about resolving conflicts
2008-08-23
Dan Hensgen
git-me
r
ge documentation: more deta
i
ls about res
o
lving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
A
lex Riesen
E
xtend
"
che
c
kou
t
--track" DWIM to support more cas
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
onathan del Stroth
e
r
Revert "Convert output messa
g
e
s
in merge-recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jun
i
o C Hamano
temp
l
ates/Make
f
ile: install
i
s unnecessary,
just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Bra
n
don Ca
s
ey
remote
.
c
:
add a function
f
o
r deleting a refspec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
Sixt
fi
l
ter-
b
ranch: Grok sp
e
cial characters
i
n
tag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johan
n
e
s Schindelin
te
s
t
-
l
ib: do not remove trash_
d
irectory if called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzini
prov
i
de more errors for th
e
"merge into empty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Sha
w
n O
.
Pearce
Make reflog query '@{1219188
2
91}' act as '@{
2
0
08
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
N
e
il Robe
r
t
s
conf
i
g
.
ma
k
.
in
:
Pass on LDFLA
G
S from
configure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
c
o
m
pat/snp
r
intf
.
c: handle snprin
t
f's t
h
at always
r
eturn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
Teach "g
i
t diff -p" HTML fun
c
name pat
t
erns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
Te
a
ch "gi
t
d
i
ff -p" Python funcname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eri
c
W
o
ng
git-svn:
f
ix dcommi
t
to urls
with embedded userna
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Ham
a
no
Merge branch 'ml/submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge branch
'
pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Ham
a
no
Merg
e
branch 'sb
/
co
m
mit-tree-
m
inil
e
ak'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
io C Hama
n
o
Mer
g
e
br
a
nch 'pb/
r
eflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
Merge branc
h
'
j
c/add-stop-at-
s
ymlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hama
n
o
Merge br
a
n
ch 'kh/
d
iff-tree'
commit
|
commitdiff
|
tree
2008-08-21
J
unio
C
Hamano
Merge branch 'mg/co
u
nt-o
b
jects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'mz/push-verbose'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merge branch
'
jc
/
index-e
x
tended
-
flags'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge
b
r
anch 'cc/
m
erge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
br
a
nch 'jc/
t
est-deeper'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge branch 'j
s
/parallel-
t
est'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
revi
s
ion
.
h: make show_early_ou
t
pu
t
an ext
e
rn
w
hich
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Ham
a
no
Update draft r
e
lease notes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Ha
m
a
n
o
Update draft release
notes for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Tarmigan Casebolt
Add hin
t
s to revert
d
ocumentation about other ways
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
ohannes Sixt
Install te
m
pl
a
tes with t
h
e user and gro
u
p of the installing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
m
ano
"git-merge"
:
allow fast-fo
r
war
d
ing i
n
a stat-d
i
rty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hamano
complet
i
on: fi
n
d out supported
m
erg
e
str
a
t
egies
co
r
rec
t
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
e
ff King
decorate: allow
c
onst objects to
b
e decorated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio
C
Ham
a
no
f
or-each-re
f
:
c
ope wit
h
tags wit
h
incomplet
e
li
n
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
di
f
f --check: do
not ge
t
c
onf
u
sed by new blank li
n
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
Merg
e
branch 'bd/
d
iff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
M
erge branch 'dp/h
a
sh-liter
a
lly'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
Merge b
r
anch 'js/checkout-dwim-local'
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
Merge b
r
anch 'ph/enable-threa
d
ed'
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C H
a
mano
Merge branch 'jk/pa
g
er-sw
a
p'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Me
r
ge branch 'rs/im
a
p'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'j
s
/mingw-sta
t
'
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
remote
.
c: remove useless if-
b
efore-free test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
eff King
mail
i
nfo: avoid violating strbuf assertion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim Me
y
e
r
ing
reword --full-ind
e
x description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim
Meyering
Su
b
mitti
n
gP
a
tches: fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ji
m
Meyering
add boolean dif
f
.
suppress-blank-empty config
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim M
e
yering
git format
-
patc
h
: a
v
oid underrun when format
.
headers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Jun
i
o
C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-19
B
randon C
a
sey
t1002-rea
d
-tree-m-u-2way
.
s
h
: u
s
e 'git diff -U0' r
a
ther
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Marcus Griep
Update t/
.
gitignore
to ignore all trash directories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Johann
e
s Sixt
Revert "Wind
o
ws
:
Use
a customized struct stat that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Ju
n
i
o
C
Hama
n
o
co
m
pat: i
n
t
r
odu
c
e on_disk_
b
yte
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Ro
b
e
rt Schiele
ad
a
pt git-cvsserver man
p
age to
d
ash-fre
e
sy
n
tax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
D
o
n Zickus
mailinfo: r
e
-fix MIME
multipart boundary parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mark L
e
v
e
dahl
g
i
t-submodule - Ad
d
'foreach' subcom
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Be
y
er
Fi
x
commit_tr
e
e(
)
b
uffer le
a
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Peter Valdemar
Mørch
T
e
ach gi
t
log
-
-exit
-
code t
o
return
a
n appropriate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Peter
V
aldema
r
M
ø
rch
Teach git l
o
g --check to ret
u
rn an app
r
o
p
riate exit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Pieter de
B
ie
b
u
i
l
tin-reflog:
A
l
l
o
w
reflog ex
p
ire to
n
ame partial ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio
C Hamano
Start 1
.
6
.
1
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Hamano
Start
1
.
6
.
0
.
X maint
e
n
a
n
ce s
e
r
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Ham
a
no
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Juni
o
C
Hamano
Merg
e
git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C
Hamano
Merge branch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Marcus Griep
count-o
b
j
e
cts:
A
dd total
pack size to verbos
e
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
tests: use $T
E
ST
_
DI
R
ECTORY to refer to the
t
/ directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Marek Zawirski
Make push mor
e
verbose about
i
llegal comb
i
nation of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Ha
m
ano
i
n
dex
:
fut
u
r
e
pr
o
of for "extended" index
e
ntries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
R
o
bert
Blum
git-p4:
c
h
di
r
n
ow
p
roperly se
t
s PWD environment variabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
S
tephan Beyer
Improve
e
rror
o
ut
p
ut
o
f git-re
b
as
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
ajna
t9300:
replac
e
'!' with
t
e
s
t_must_fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C H
a
man
o
M
e
rge git://git
.
kernel
.
org/p
u
b/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2008-08-16
M
arcus G
r
i
ep
Git
.
pm: Make
Fil
e
::Spec and File::Temp requirement
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Do
c
u
mentation: document th
e
pager
.
* con
f
iguration setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Stephan Beyer
git-st
a
sh: improve
s
ynopsis in he
l
p
and manual
p
a
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Eric Blake
Makefile: buildin
g
git in
c
ygwi
n
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Step
h
an Beyer
gi
t
-am: ign
o
r
e
--binary opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-16
Marcus Gr
i
ep
b
a
sh-c
o
m
p
let
i
on: Ad
d
non-com
m
a
n
d git h
e
lp files t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Alex Ri
e
sen
Fix t
3
700 on
filesy
s
tems which
d
o
n
ot
support
q
uestion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
A
n
and
K
umr
i
a
Utilise our new
p
4
_
read_pipe and p
4
_writ
e
_p
i
pe wrap
p
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
A
nand Kumria
Add p
4
read_pipe and
w
rite
_
pip
e
wrappers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee M
a
rlow
bash c
o
mpleti
o
n:
Add '
-
-merg
e
' lon
g
option for 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Lee
Marlow
bash
c
ompletion: Add completion for 'git
mer
g
etool'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Matt Mc
C
utchen
git for
m
at-patc
h
documentation: clarify what --cove
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-15
Er
i
c Raible
bas
h
completion: 'git
ap
p
ly' shou
l
d use
'fix'
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio
C Hamano
xdiff
-
in
t
erface:
h
i
d
e t
h
e
whole "xdif
f
_emit_state"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brian D
o
wning
Use
s
t
rbuf for
s
tr
u
ct xdif
f
_emit_st
a
te's remainder
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Brian Dow
n
i
ng
Ma
k
e xdi_diff_outf inter
f
a
c
e
f
or
ru
n
ning
x
diff_outf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Ju
n
io
C
Hamano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-14
Brandon Casey
t
5
3
0
4-
p
rune:
ad
j
ust fi
l
e mti
m
e based
on system
time
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Bra
n
don Casey
test-parse-option
s
: use a
p
pro
p
riate ca
s
t in length_callback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Kevi
n
Balla
r
d
Fix e
s
caping of glob
s
peci
a
l char
a
cters in path
s
pe
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
r
e
base -
i
-
p
: fix
p
arent r
e
writi
n
g
commit
|
commitdiff
|
tree
2008-08-13
Tho
m
as Ra
s
t
re
b
ase -
i
-p: h
a
ndle inde
x
and workdir correctly
commit
|
commitdiff
|
tree
2008-08-13
J
u
ni
o
C Ham
a
no
GIT
1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
J
un
i
o C Hamano
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
next