repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
revert: clarify label on conflict hunks
2010-03-07
Junio
C
Hamano
Merge branch 'il/loosen
-
remote-helper-name
s
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
Merge
b
r
anch 'nd/root-git'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Haman
o
Merge branch 'js/runtime-prefix-t
r
a
ce-not-warn'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
M
e
r
g
e
b
r
anch 'mm/mkstemps-mo
d
e
-
for-
p
ackfiles
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge b
r
anch 'jk/maint-add--
i
ntera
c
tive-delete
'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
H
a
ma
n
o
Merge branch 'jc/
m
ai
n
t
-
fix
-
m
a
ilinfo-strip'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
c
o
lor: allow multiple attributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Sync with
1
.
7
.
0
.
2
commit
|
commitdiff
|
tree
2010-03-07
Mark Lodato
Add GIT_COL
O
R_BOLD_* and G
I
T
_
C
OLOR_BG_*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
G
it 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Be
r
t
Wesarg
unse
t
GREP_OPTIONS in test-li
b
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-07
B
jörn
G
ustav
s
s
o
n
t3417: Add test
c
ases for "rebase
-
-whitespace
=
fix"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Björ
n
Gustavsso
n
t
4
124: Add ad
d
itional tests o
f
--whitespace=fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Björn Gu
s
tavs
s
on
app
l
y: Al
l
ow blank conte
x
t
lines to match beyon
d
EOF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Bjö
r
n
G
ustavss
o
n
app
l
y
: Rem
o
ve the qui
c
k
rejection test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Björn Gustavsson
apply: Don't un
n
ec
e
ssarily update
l
ine
lengths in th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Chri
s
t
ia
n
Couder
reset: disallo
w
using --keep when there
a
re
unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
C
hristi
a
n Couder
reset
:
dis
a
llow "re
s
et --k
e
ep" outside a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Christi
a
n
C
ouder
Documentat
i
on: rese
t
:
describe new "-
-
k
eep
"
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Matthieu Moy
stash: suggest the correct com
m
a
nd line fo
r
u
n
kn
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
S
t
e
p
hen Boyd
t
7
40
6
: F
i
x
s
u
bmod
u
le init co
n
fig te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Steven Dr
a
ke
Ad
d
'gi
t
format-pat
c
h
-
-t
o
=' op
t
ion and '
f
ormat
.
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
H
a
mano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C Hamano
Update draft release note
s
to 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
Junio C
H
a
mano
Merge branch 'jn/git
w
eb-config-er
r
o
r
-die' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C Ham
a
no
Merge b
r
an
c
h 'jn/mai
n
t-fix-pager'
into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
M
e
rge branch 'tr/maint
-
cherry-pick-
l
ist' into maint
commit
|
commitdiff
|
tree
2010-03-05
J
unio C Hamano
M
e
rge
branch 'ld/maint-
d
i
ff-quiet-w
'
into maint
commit
|
commitdiff
|
tree
2010-03-05
J
uni
o
C Hamano
Merge branch
'rs/
o
p
tim-text-
w
r
a
p' into maint
commit
|
commitdiff
|
tree
2010-03-05
J
u
n
io C Hamano
Merge bra
n
c
h
'dp/
r
ea
d
-not
-
mmap-small-lo
o
se-object'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C
Hamano
Merge
bra
n
c
h 'np/comp
r
e
s
s
-l
o
o
s
e-o
b
ject-memsav
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C H
a
mano
Merge bran
c
h 'jc/ma
i
nt-s
t
atus-preload' into
m
a
in
t
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into
m
aint
commit
|
commitdiff
|
tree
2010-03-05
J
unio
C
Hamano
Me
r
g
e
branch
'cc/maint-bisect
-
paths' into maint
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
io C H
a
mano
Merge branch 'maint-1
.
6
.
6' into
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch 'maint
-
1
.
6
.
5'
into maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Frank L
i
g
i
t-cor
e
:
Supp
o
rt retrie
v
ing p
a
s
swords wit
h
G
IT_ASKPASS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
Michael J
Gru
b
er
Documentation: fix a few typ
o
s in git-notes
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
Michal Sojka
Remov
e
ex
t
ra
'-' f
r
om gi
t
-a
m
(
1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-04
Micha
e
l W
o
o
k
ey
run-command
.
c
:
fix build
w
arn
i
ngs on
U
buntu
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
J
unio
C
Hamano
M
e
rge b
r
anch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C Hama
n
o
Merge
b
ra
n
ch 'jh/maint-submod
u
le-statu
s
-in
-
void' (early
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jeff King
submodule
s
ummary: d
o
not shift
a non-exis
t
ent po
s
itional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C Hama
n
o
Star
t
preparing f
o
r 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio C H
a
mano
M
e
rge bra
n
c
h 'tc/maint-transport-ls-r
e
mote-with-void
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C Hamano
Merge branch '
h
m
/maint-imap
-
send
-
crlf'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge bran
c
h 'sp/ma
i
nt-push-sideband'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C
Hamano
M
e
rge branc
h
'jc/m
a
int-fix-t
e
st-perm'
i
n
to maint
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Me
r
ge branch
'
np/fast-import-idx
-
v2' into maint
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesa
r
g
merge-file: ad
d
opt
i
on to
sele
c
t uni
o
n mer
g
e favor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert
Wesarg
m
e
rge-fil
e
: add option
t
o specify the m
a
r
ker size
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
wrap-for-bin: do not exp
o
rt
an empty GIT_TE
M
PLATE_DIR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
F
rank Li
git-sv
n
: Suppor
t
retriev
i
ng pa
s
swords with GIT_ASKPASS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
Hamano
Merge b
r
anch 'jn/maint-fix
-
pager'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge branch
'
m
l
/encode-
h
eader-refactor'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C Hamano
Merge branch 'jn
/
g
itweb-
c
onfig-er
r
or-die'
commit
|
commitdiff
|
tree
2010-03-02
J
u
n
io C Hamano
Me
r
ge
branch 'jc/for-eac
h
-
r
ef'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C Ham
a
no
M
e
r
g
e bran
c
h
'ld/m
a
int-d
i
ff
-
quiet-w'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o
C
Hamano
Merge b
r
anch
'
tr/maint-
c
h
e
r
ry-
p
ick
-
list
'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C Hamano
Merge branch 'rs/optim
-
text-wrap'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C Hamano
M
erge branch
'ml/send-p
a
ck-transport-re
f
actor'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
H
a
man
o
Merge branch 'ml/fill-mm-re
f
actor'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hamano
Merge branch
'ml
/
conn
e
ct
-
refactor'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hama
n
o
Merge bran
c
h
'
n
p
/comp
r
e
ss-loo
s
e
-object-memsav
e
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ha
m
a
n
o
Merge branch 'dp/read-not-mmap-
s
m
a
ll
-
loose-object'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io
C
Hamano
M
e
rge
b
ranch
'jn/ma
k
edepend'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ham
a
no
M
erge branch 'jc/
m
aint-status-prel
o
ad'
commit
|
commitdiff
|
tree
2010-03-02
J
u
n
io C Ham
a
no
Merge branch 'gf/ma
i
n
t
-sh-set
u
p-non
g
it-o
k
'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io C Hamano
Merge branch
'jh
/
maint-
s
ubmo
d
ul
e
-status-in-void
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge branch '
h
m/imap-send-
c
ram
-
md5'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hama
n
o
M
e
rg
e
branch 'ml/colo
r
-when'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Hamano
Merge branch 'ac/c
v
simp
o
rt-revision-mapping'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C Hamano
M
e
rge branch 'jc/gre
p
-a
u
t
h
or
-
a
ll-ma
t
ch-impl
i
c
it'
commit
|
commitdiff
|
tree
2010-03-02
Frank Li
fallba
c
k SSH_ASKPASS w
h
en GIT_ASKPASS not se
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Jakub Na
r
ebski
gitw
e
b:
F
i
x
proje
c
t
-
specif
i
c feat
u
re override behavi
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Sylvain Rabot
gitweb
multiple
p
r
oject ro
o
ts document
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
B
ert W
e
s
a
rg
ref
a
ctor merg
e
flag
s
into xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert We
s
arg
m
a
ke u
n
ion mer
g
e an xdl merge
f
a
v
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Tay
R
ay
C
h
u
a
n
re
m
ote
-
c
u
rl: ini
t
w
a
lker only
when needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Ta
y
R
a
y C
h
uan
remote-c
u
rl: use
htt
p
_
fetch_r
e
f(
)
instead of walker
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Tay
R
a
y Chu
a
n
http:
init and cleanu
p
s
e
parately from http-walker
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ray Chuan
http-walker: cleanup more thoroughly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Tay R
a
y
Chuan
http-
p
u
s
h
:
r
emov
e
"
|
|
1
" to
enable ve
r
bose
c
he
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ra
y
Chuan
t554[01]-htt
p
-push: refactor, add non-
f
f te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ray
C
huan
t5
5
4
1-h
t
tp-push: ch
e
c
k
tha
t
r
e
f i
s
unchan
g
ed
f
o
r
non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-01
J
u
nio
C
Hamano
Merge b
r
anch 'cc/maint-bisect
-
paths'
commit
|
commitdiff
|
tree
2010-03-01
Chr
i
s
tia
n
Couder
bisect
:
error out whe
n
p
a
ss
i
ng bad
p
ath parameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
J
unio C Ha
m
ano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-02-28
Junio C Hamano
Git 1
.
7
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
M
a
rk
L
odato
Remov
e
reference
to GREP_COLORS from d
o
cumen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
S
t
efan-W
.
Hahn
git-
a
m: Add te
s
ts for `--keep-c
r
`, `--no-keep
-
cr` and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
S
tefan-W
.
Ha
h
n
git-am: Add am
.
ke
e
pcr
a
nd
-
-no
-
keep-cr to override
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Stef
a
n
-W
.
Hahn
git-am: Add
command
line
para
m
ete
r
`--keep-cr` passing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Stef
a
n
-
W
.
Hahn
documentation: 'git-mailsplit --keep-cr' is not hidden
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Jo
n
at
h
an Nieder
Makef
i
le
:
clar
i
f
y
defi
n
i
tio
n
of TEST_OBJS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
L
arry D
'
A
n
na
git
-
push: add tests for git push
-
-
p
orcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Larry D'Anna
git-push:
m
ake git pu
s
h --p
o
rcelain print "Done"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Larry
D
'A
n
na
git-push: s
e
nd
"
To
<r
e
moteurl
>
" messages to the standard
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next