Andrew's git
/
gitweb.git
/ search
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
test that git status works with merge conflict in, .gitmodules
2011-05-14
test that git status works with merge conflict in,...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-13
Prepare for 1.7.5.2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-13
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
diff
|
tree
2011-05-13
Merge branch 'js/blame-parsename' into maint
diff
|
tree
2011-05-13
Merge branch 'gr/cvsimport-alternative-cvspass-location...
diff
|
tree
2011-05-13
Merge branch 'cj/p4merge' into maint
diff
|
tree
2011-05-13
Merge branch 'jk/merge-one-file-working-tree' into...
diff
|
tree
2011-05-13
Merge branch 'jc/fix-diff-files-unmerged' into maint
diff
|
tree
2011-05-13
Merge branch 'mz/maint-rename-unmerged' into maint
diff
|
tree
2011-05-13
t5400: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-06
Remove duplicated "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-05
t3701: fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-05
git-fast-import.txt: --relative-marks takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-05
shell: add missing initialization of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-05
t/annotate-tests: Use echo & cat instead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-04
Git 1.7.5.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-04
Merge branch 'jh/dirstat' into maint
diff
|
tree
2011-05-04
Merge branch 'sp/maint-clear-postfields' into maint
diff
|
tree
2011-05-04
Merge branch 'jk/maint-stash-oob' into maint
diff
|
tree
2011-05-04
Merge branch 'jk/maint-upload-pack-shallow' into maint
diff
|
tree
2011-05-04
Merge branch 'dm/stash-k-i-p' into maint
diff
|
tree
2011-05-04
Merge branch 'jc/pack-objects-bigfile' into maint
diff
|
tree
2011-05-04
Merge branch 'mg/reflog-with-options' into maint
diff
|
tree
2011-05-04
Merge branch 'jk/stash-loosen-safety' into maint
diff
|
tree
2011-05-04
Merge branch 'ar/clean-rmdir-empty' into maint
diff
|
tree
2011-05-04
Merge branch 'mg/sha1-path-advise' into maint
diff
|
tree
2011-05-04
git-add.txt: document 'add.ignoreErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-01
Pass empty file to p4merge where no base is suitable.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-05-01
Look for password in both CVS and CVSNT password files.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-29
merge-one-file: fix broken merges with alternate work...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-29
add tests for merge-index / merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-29
Start 1.7.5.1 maintenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-29
Merge branch 'mg/x-years-12-months' into maint
diff
|
tree
2011-04-29
git-send-email: fix missing space in error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-29
blame: tolerate bogus e-mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-28
git-rebase--interactive.sh: preserve-merges fails on...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-26
http: clear POSTFIELDS when initializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-24
Git 1.7.5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-24
diff-files: show unmerged entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-24
diff: remove often unused parameters from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-24
diff.c: return filepair from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-24
test: use $_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-21
date: avoid "X years, 12 months" in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-19
Git 1.7.5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-19
Sync with 1.7.4.5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-19
Git 1.7.4.5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-19
git-svn.txt: Document --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-18
Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
diff
|
tree
2011-04-14
Merge branch 'maint'
diff
|
tree
2011-04-14
archive: document limitation of tar.umask config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-14
t3306,t5304: avoid clock skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-14
git.txt: fix list continuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-13
Git 1.7.5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-13
Merge branch 'maint'
diff
|
tree
2011-04-13
Merge branch 'jc/rev-list-options-fix' into maint
diff
|
tree
2011-04-13
Merge branch 'js/checkout-untracked-symlink' into maint
diff
|
tree
2011-04-13
remove doubled words, e.g., s/to to/to/, and fix related...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-13
revert: Hide '-r' option in default usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-12
--dirstat: In case of renames, use target filename...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-12
Merge branch 'js/checkout-untracked-symlink'
diff
|
tree
2011-04-12
Merge branch 'nd/init-gitdir'
diff
|
tree
2011-04-12
t2021: mark a test as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-12
t0001: guard a new test with SYMLINKS prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-11
Teach --dirstat not to completely ignore rearranged...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-11
Makefile: extract Q_() source strings as ngettext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-11
i18n: avoid parenthesized string as array initializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-11
--dirstat-by-file: Make it faster and more correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-11
--dirstat: Describe non-obvious differences relative...
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-11
Merge git://git.bogomips.org/git-svn
diff
|
tree
2011-04-11
Merge git://git.kernel.org/pub/scm/gitk/gitk
diff
|
tree
2011-04-07
stash: ensure --no-keep-index and --patch can be used...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-07
stash: add two more tests for --no-keep-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-07
git-p4: replace each tab with 8 spaces for consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-06
upload-pack: start pack-objects before async rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-06
Git 1.7.5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-06
Sync with 1.7.4.4
diff
|
tree
2011-04-06
Git 1.7.4.4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-06
Merge branch 'nm/maint-conflicted-submodule-entries...
diff
|
tree
2011-04-06
Merge branch 'mg/rev-list-n-reverse-doc' into maint
diff
|
tree
2011-04-06
Merge branch 'jk/maint-remote-mirror-safer'
diff
|
tree
2011-04-06
Merge branch 'mg/doc-revisions-txt'
diff
|
tree
2011-04-06
stash: drop dirty worktree check on apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-06
Teach core.bigfilethreashold to pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-06
stash: fix false positive in the invalid ref test.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-06
stash: fix accidental apply of non-existent stashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-04
revisions.txt: language improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-04
Merge branch 'maint'
diff
|
tree
2011-04-04
Merge branch 'jl/submodule-fetch-on-demand'
diff
|
tree
2011-04-04
Merge branch 'jc/rev-list-options-fix'
diff
|
tree
2011-04-04
Documentation: trivial grammar fix in core.worktree...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-04
gitweb: Fix parsing of negative fractional timezones...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-04
Merge branch 'nm/maint-conflicted-submodule-entries'
diff
|
tree
2011-04-03
Merge branch 'maint'
diff
|
tree
2011-04-03
Start preparing for 1.7.4.4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-03
pull: do not clobber untracked files on initial pull
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-04-03
Merge branch 'jc/index-update-if-able' into maint
diff
|
tree
2011-04-03
Merge branch 'lt/default-abbrev' into maint
diff
|
tree
2011-04-03
Merge branch 'jc/maint-rev-list-culled-boundary' into...
diff
|
tree
2011-04-03
Merge branch 'mm/maint-log-n-with-diff-filtering' into...
diff
|
tree
2011-04-03
Merge branch 'jk/format-patch-multiline-header' into...
diff
|
tree