Andrew's git
/
gitweb.git
/ search
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tr/workflow-doc'
2008-09-03
Update draft release notes for 1.6.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-09-03
Merge branch 'maint'
diff
|
tree
2008-09-03
Start 1.6.0.2 maintenance cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-09-03
Merge branch 'nd/worktree' into maint
diff
|
tree
2008-09-03
Merge branch 'ho/dashless' into maint
diff
|
tree
2008-09-03
Merge branch 'tr/filter-branch'
diff
|
tree
2008-09-03
Merge branch 'np/maint-safer-pack'
diff
|
tree
2008-09-03
Merge branch 'rf/man-env'
diff
|
tree
2008-09-03
Merge branch 'jc/author-nickname'
diff
|
tree
2008-09-03
Merge branch 'dp/pid-uintmax'
diff
|
tree
2008-09-03
Merge branch 'maint'
diff
|
tree
2008-09-03
Merge branch 'np/maint-safer-pack' into np/pack
diff
|
tree
2008-09-01
git-merge documentation: describe how conflict is presented
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-09-01
checkout --conflict=<style>: recreate merge in a non...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-09-01
Merge branch 'tr/rev-list-docs' into tr/filter-branch
diff
|
tree
2008-08-31
Merge branch 'maint'
diff
|
tree
2008-08-31
git-add --intent-to-add (-N)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
'git foo' program identifies itself without dash in...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
git commit --author=$name: look $name up in existing...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
diff: vary default prefix depending on what are compared
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
diff: Help "less" hide ^M from the output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
Merge branch 'maint'
diff
|
tree
2008-08-31
gitattributes: -crlf is not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
checkout -m: recreate merge when checking out of unmerged...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
Merge branch 'jc/maint-checkout-fix' into 'jc/better...
diff
|
tree
2008-08-31
git-merge-recursive: learn to honor merge.conflictstyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
merge.conflictstyle: choose between "merge" and "diff3...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
rerere: understand "diff3 -m" style conflicts with...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
rerere.c: use symbolic constants to keep track of parsing...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
xmerge.c: "diff3 -m" style clips merge reduction level...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
xmerge.c: minimum readability fixups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
xdiff-merge: optionally show conflicts in "diff3 -m...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
xdl_fill_merge_buffer(): separate out a too deeply...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
checkout --ours/--theirs: allow checking out one side...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-31
checkout -f: allow ignoring unmerged paths when checking...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-30
checkout: do not check out unmerged higher stages randomly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-30
Merge branch 'jc/post-simplify' (early part) into tr...
diff
|
tree
2008-08-30
git-apply: Loosen "match_beginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-30
Fix example in git-name-rev documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-30
Merge branch 'sp/missing-thin-base' into maint
diff
|
tree
2008-08-30
Merge branch 'sb/daemon'
diff
|
tree
2008-08-30
Merge branch 'af/maint-install-no-handlink' into maint
diff
|
tree
2008-08-30
shell: do not play duplicated definition games to shrink...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-30
Merge branch 'np/verify-pack' into maint
diff
|
tree
2008-08-29
Merge branch 'maint'
diff
|
tree
2008-08-28
Merge branch 'mv/merge-custom'
diff
|
tree
2008-08-28
Merge branch 'ml/submodule'
diff
|
tree
2008-08-27
Merge branch 'am/cherry-pick-rerere'
diff
|
tree
2008-08-27
Merge branch 'jc/add-addremove'
diff
|
tree
2008-08-27
Merge branch 'np/verify-pack'
diff
|
tree
2008-08-27
Merge branch 'da/submodule-sync'
diff
|
tree
2008-08-27
Merge branch 'maint'
diff
|
tree
2008-08-27
ctype.c: protect tiny C preprocessor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-27
Merge branch 'af/maint-install-no-handlink'
diff
|
tree
2008-08-27
Merge branch 'jc/no-slim-shell'
diff
|
tree
2008-08-27
Merge branch 'maint'
diff
|
tree
2008-08-26
daemon.c: minor style fixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-26
Revert "Build-in "git-shell""
diff
|
tree
2008-08-24
Merge branch 'jc/no-slim-shell'
diff
|
tree
2008-08-24
Merge branch 'maint' to sync with 1.6.0.1
diff
|
tree
2008-08-24
GIT 1.6.0.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-24
Merge branch 'ag/maint-combine-diff-fix' into maint
diff
|
tree
2008-08-24
Merge branch 'mv/maint-merge-fix' into maint
diff
|
tree
2008-08-24
t7606: fix custom merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-24
Merge branch 'maint'
diff
|
tree
2008-08-24
merge: fix numerus bugs around "trivial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-24
unpack_trees(): protect the handcrafted in-core index...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-23
discard_cache: reset lazy name_hash bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-22
templates/Makefile: install is unnecessary, just use...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-21
Merge branch 'maint'
diff
|
tree
2008-08-21
Merge branch 'ml/submodule-foreach'
diff
|
tree
2008-08-21
Merge branch 'pm/log-exit-code'
diff
|
tree
2008-08-21
Merge branch 'sb/commit-tree-minileak'
diff
|
tree
2008-08-21
Merge branch 'pb/reflog-dwim'
diff
|
tree
2008-08-21
Merge branch 'jc/add-stop-at-symlink'
diff
|
tree
2008-08-21
Merge branch 'kh/diff-tree'
diff
|
tree
2008-08-21
Merge branch 'mg/count-objects'
diff
|
tree
2008-08-21
Merge branch 'mz/push-verbose'
diff
|
tree
2008-08-21
Merge branch 'jc/index-extended-flags'
diff
|
tree
2008-08-21
Merge branch 'cc/merge-base-many'
diff
|
tree
2008-08-21
Merge branch 'jc/test-deeper'
diff
|
tree
2008-08-21
Merge branch 'js/parallel-test'
diff
|
tree
2008-08-21
Fix "git-merge -s bogo" help text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-20
Update draft release notes for 1.6.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-20
Merge branch 'maint'
diff
|
tree
2008-08-20
Update draft release notes for 1.6.0.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-20
"git-merge": allow fast-forwarding in a stat-dirty...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-20
completion: find out supported merge strategies correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-20
for-each-ref: cope with tags with incomplete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-20
diff --check: do not get confused by new blank lines...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-20
Build-in "git-shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-20
Merge branch 'bd/diff-strbuf'
diff
|
tree
2008-08-20
Merge branch 'dp/hash-literally'
diff
|
tree
2008-08-20
Merge branch 'js/checkout-dwim-local'
diff
|
tree
2008-08-20
Merge branch 'ph/enable-threaded'
diff
|
tree
2008-08-20
Merge branch 'jk/pager-swap'
diff
|
tree
2008-08-20
Merge branch 'rs/imap'
diff
|
tree
2008-08-20
Merge branch 'js/mingw-stat'
diff
|
tree
2008-08-20
shell: do not play duplicated definition games to shrink...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2008-08-19
Merge branch 'maint'
diff
|
tree