repo.or.cz
/
git
/
mingw
/
4msysgit
/
wingit-dll.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint' to sync with 1.6.0.1
2008-08-24
Jun
i
o C Hamano
M
erge bra
n
ch 'maint'
to sync w
i
th 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
ma
n
o
Merge br
a
nch 'ag/
m
aint-combine-diff-fix'
i
nto maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
Merge branch 'mv/maint-merge-fix' into m
a
int
commit
|
commitdiff
|
tree
2008-08-24
Ma
r
k Le
v
ed
a
hl
git-su
b
mod
u
le - U
s
e "get_def
a
ult_
r
emote" from git-parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jonatha
n
N
i
eder
Document
a
tion: clarify
pager conf
i
g
uration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan
Nieder
D
ocumentation: clarify pager
.
<cmd> configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
Clean up the
g
i
t-p4 documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Alexa
n
d
e
r G
a
v
r
il
o
v
Re
s
pect
c
o
r
e
.
autocrlf in
combined diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Mak
e
file: enab
l
e SNPRIN
T
F_RETURNS_
B
OG
U
S for HP-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
merge: fix
n
u
m
erus bugs around "trivial merge" area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C
H
aman
o
u
n
pack_trees(): protec
t
the handcrafted in-cor
e
in
d
e
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Tor
A
r
vid Lun
d
git-
p
4: F
i
x one-li
n
er in p4_write
_
pipe
function
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
lar
g
it-submodule: re
p
lace
duplicated cod
e
with a module_l
i
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensgen
git-merge documentation:
mor
e
detail
s
about resolving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Alex Riese
n
Exte
n
d
"check
o
ut --track
"
D
WIM to
su
p
port more case
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan
del Strother
Revert "Convert output messages in m
e
rge-recur
s
i
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Eric
Raib
l
e
Com
p
letion:
a
dd missing '=' for 'diff
--dif
f
-fi
l
ter
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
J
u
nio
C Hamano
templates/Make
f
i
le
:
ins
t
all is unnecessary,
j
ust use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
B
r
a
n
d
on Ca
s
ey
remote
.
c: add a function for deleting a refspec array
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johanne
s
Sixt
filter-branch: Grok special
c
haracters in tag
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Schindelin
test-lib:
do not
r
emove trash
_
directory if called with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Paol
o
Bonzini
pr
o
vide
more errors
for the "merge in
t
o empty head
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pe
a
rce
Make reflog
query '@{1
2
19188291}' act as '@{2008
.
8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Nei
l
Roberts
c
o
n
fig
.
mak
.
i
n
: Pas
s
o
n
L
DFLAGS from c
o
nfig
u
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
os Vajna
Fix
'
git h
e
lp help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Haman
o
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
compat/snp
r
in
t
f
.
c: handle snprin
t
f's
that always return
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Jo
h
an Herland
Teach
"git dif
f
-p" HTML
funcname patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Kirill
S
m
elkov
Teach
"
git dif
f
-p" Pyth
o
n fun
c
n
a
me
p
a
t
terns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wo
n
g
gi
t
-
svn:
fix dcomm
i
t t
o
urls with embedded usernames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branc
h
'ml
/
submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hama
n
o
Merge branch 'pm/log-ex
i
t-code
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
Merge branch 's
b
/
commit-tree
-
minileak
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merge branch 'p
b
/reflog-dwi
m
'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io
C
Hamano
Merge
br
a
nch 'jc/add-stop-
a
t-s
y
m
link'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merge
branch
'
kh/dif
f
-tree'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o C Ham
a
n
o
M
erge branch '
m
g/count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
H
a
mano
Merge branch 'mz/push-ver
b
ose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'jc/index
-
exten
d
ed-flags'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge
b
r
a
nch 'cc/merg
e
-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merge branch '
j
c/test-deeper'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merg
e
branch 'js/parallel-tes
t
'
commit
|
commitdiff
|
tree
2008-08-21
Bran
d
o
n C
a
sey
revi
s
i
on
.
h: make
s
how_ea
r
ly_output an extern
w
h
ic
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
a
mano
Update draft r
e
lease not
e
s
for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C
Hamano
M
e
r
g
e branch
'maint'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Haman
o
U
p
date draft rel
e
ase
notes for
1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Tarmigan Case
b
o
l
t
Ad
d
hin
t
s
t
o revert documentation about o
t
her
w
ays
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
ohanne
s
S
ixt
Install template
s
with
th
e
u
s
er and group of
t
he insta
l
li
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
"
git-merge": allow fas
t
-forwarding in a
s
tat-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
completion: f
i
n
d
ou
t
s
u
pported merge strategie
s
correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
eff
K
i
ng
deco
r
a
t
e:
a
l
l
o
w const ob
j
ects to
b
e decor
a
t
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
am
a
no
for
-
each-ref:
c
op
e
with tags
w
ith incomplete lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
diff --check: do not get co
n
fused by n
e
w blank lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hama
n
o
Merg
e
br
a
nch 'bd/diff-st
r
buf'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
Mer
g
e branch 'dp/hash-literally
'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
amano
Merge br
a
nch 'j
s
/checkout-dwim-local'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge bra
n
c
h 'ph/
e
na
b
le-threa
d
ed'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Merge branch '
j
k/pager-s
w
ap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C H
a
mano
M
erge branch 'rs/imap'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
Mer
g
e b
r
anch 'js/m
i
ngw-
s
ta
t
'
commit
|
commitdiff
|
tree
2008-08-20
Jim Me
y
ering
remot
e
.
c
: remove useless
if-before-fr
e
e
t
e
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
mailinfo
:
avoid
v
iolating strbuf a
s
sertion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
r
e
word --full-index d
e
s
c
ripti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
Su
b
mittingP
a
tches: fix a t
y
po
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyeri
n
g
a
d
d
bool
e
an diff
.
suppress-b
l
ank-empty conf
i
g
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jim Mey
e
ri
n
g
g
it format-patch: avoi
d
underru
n
when format
.
headers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
M
er
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-19
Brandon Casey
t100
2
-
read-tr
e
e-m-u-2wa
y
.
sh: use '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/
.
g
i
tignore to ign
o
re all trash directories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
J
ohan
n
es Sixt
Revert "Windows: Us
e
a
customize
d
s
t
ruct stat that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
J
unio C
Ham
a
no
compat: in
t
roduce on_disk
_
byt
e
s()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
R
o
bert
S
chiele
adapt git-cv
s
serve
r
ma
n
page to das
h
-free syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
D
o
n Zickus
mai
l
info: re
-
fix MIME mu
l
tipart b
o
undary par
s
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Mar
k
Leveda
h
l
git-subm
o
dule
-
A
d
d
'fore
a
ch'
s
u
bcommand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Stepha
n
Beyer
Fix commit_
t
re
e
() buf
f
er leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Peter Vald
e
mar Mørch
Teach git log --e
x
i
t
-
code to
r
eturn an appro
p
r
i
a
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Peter Valdemar Mø
r
ch
Teach git
log --check to retur
n
an appropriate exit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Pi
e
ter d
e
Bie
builtin-refl
o
g: Allow reflog e
x
pire to nam
e
partial ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Haman
o
Start 1
.
6
.
1 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
i
o C Ha
m
ano
Start
1
.
6
.
0
.
X maintenance series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
GIT 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C
Hama
n
o
Merge git-gui
0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
M
erge branc
h
'
ak/
p
4'
commit
|
commitdiff
|
tree
2008-08-17
Ma
r
cus Griep
co
u
nt-obje
c
ts: Add total pack
size to
verbose out
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hama
n
o
tests: use $TEST_DIRECTORY
to refer to the t/ directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
M
a
rek Za
w
irsk
i
M
a
ke push more
verbose
about illegal combination
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
i
n
d
e
x: future proof for "e
x
tended" index ent
r
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Robert Bl
u
m
git-p4: c
h
dir now properly sets
P
WD env
i
ronment variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
I
mprove error output
of git-rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
ajn
a
t9
3
0
0
:
r
e
p
lace '
!
'
w
ith test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Ha
m
ano
Merg
e
git://g
i
t
.
kernel
.
org/pub/
s
cm/
g
i
t
k/git
k
commit
|
commitdiff
|
tree
2008-08-16
Marcus Griep
Git
.
pm: Make
File::
S
pec and File::Temp re
q
uireme
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vaj
n
a
Docu
m
entat
i
on: docum
e
nt the page
r
.
* configuration setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Ste
p
han Beye
r
g
it-sta
s
h:
i
mprove synopsis in h
e
lp and manual page
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Eric
Bl
a
ke
Make
f
ile
:
b
u
ilding
git in cygwin 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Stephan
B
eyer
git-am: ign
o
re
-
-binary option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-16
Marcu
s
Griep
bash-completi
o
n
:
Add
n
o
n-com
m
and
g
it h
e
lp fil
e
s to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-15
Alex
Riese
n
F
i
x
t3700 on
f
ile
s
ystems whic
h
do
not support
q
uestion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next