| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | Merge branch 'sc/difftool-skip' | Junio C Hamano | 2011-10-21 | 2 | -4/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | t7800: avoid arithmetic expansion notationsc/difftool-skip | Junio C Hamano | 2011-10-14 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | git-difftool: allow skipping file by typing 'n' at prompt | Sitaram Chamarty | 2011-10-10 | 2 | -4/+48 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge branch 'jc/unseekable-bundle' | Junio C Hamano | 2011-10-21 | 3 | -59/+90 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | bundle: add parse_bundle_header() helper functionjc/unseekable-bundle | Junio C Hamano | 2011-10-13 | 3 | -9/+33 | |
| | * | | | | | | | | | | | | bundle: allowing to read from an unseekable fd | Junio C Hamano | 2011-10-13 | 1 | -35/+64 | |
| * | | | | | | | | | | | | | Merge branch 'ph/transport-with-gitfile' | Junio C Hamano | 2011-10-21 | 5 | -20/+58 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfileph/transport-with-gitfile | Johannes Schindelin | 2011-10-11 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | Add test showing git-fetch groks gitfiles | Phil Hord | 2011-10-04 | 1 | -0/+14 | |
| | * | | | | | | | | | | | | | Teach transport about the gitfile mechanism | Phil Hord | 2011-10-04 | 1 | -1/+23 | |
| | * | | | | | | | | | | | | | Learn to handle gitfiles in enter_repo | Phil Hord | 2011-10-04 | 1 | -1/+7 | |
| | * | | | | | | | | | | | | | enter_repo: do not modify input | Erik Faye-Lund | 2011-10-04 | 3 | -19/+15 | |
| | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2011-10-21 | 2 | -24/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Almost ready for 1.7.7.1 | Junio C Hamano | 2011-10-21 | 1 | -0/+20 | |
| | * | | | | | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' into maint | Junio C Hamano | 2011-10-21 | 7 | -65/+93 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-blank-at-eof-fix' into maint | Junio C Hamano | 2011-10-21 | 1 | -2/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/no-g-plus-s-on-bsd' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/diff-cleanup-records-fix' into maint | Junio C Hamano | 2011-10-21 | 3 | -3/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'il/archive-err-signal' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-merge-one-file-osx-expr' into maint | Junio C Hamano | 2011-10-21 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint | Junio C Hamano | 2011-10-21 | 2 | -0/+46 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint | Junio C Hamano | 2011-10-21 | 2 | -1/+47 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/maint-config-explicit-bool-display' into maint | Junio C Hamano | 2011-10-21 | 2 | -7/+19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | tests: add missing executable bits | Jeff King | 2011-10-20 | 2 | -0/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-19 | 1 | -2/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script | Brandon Casey | 2011-10-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-10-19 | 3 | -39/+99 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 | 3 | -39/+99 | |
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | 6 | -16/+175 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 6 | -6/+154 | |
| | * | | | | | | | | | | | | | | | | | | | | | | xdiff: factor out get_func_line() | René Scharfe | 2011-10-10 | 1 | -16/+27 | |
| | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe' | Junio C Hamano | 2011-10-19 | 1 | -108/+70 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | pickaxe: factor out pickaxers/pickaxe | René Scharfe | 2011-10-07 | 1 | -67/+43 | |
| | * | | | | | | | | | | | | | | | | | | | | | | pickaxe: give diff_grep the same signature as has_changes | René Scharfe | 2011-10-07 | 1 | -3/+4 | |
| | * | | | | | | | | | | | | | | | | | | | | | | pickaxe: pass diff_options to contains and has_changes | René Scharfe | 2011-10-07 | 1 | -14/+14 | |
| | * | | | | | | | | | | | | | | | | | | | | | | pickaxe: factor out has_changes | René Scharfe | 2011-10-07 | 1 | -36/+21 | |
| | * | | | | | | | | | | | | | | | | | | | | | | pickaxe: plug regex/kws leak | René Scharfe | 2011-10-07 | 1 | -6/+7 | |
| | * | | | | | | | | | | | | | | | | | | | | | | pickaxe: plug regex leak | René Scharfe | 2011-10-07 | 1 | -7/+6 | |
| | * | | | | | | | | | | | | | | | | | | | | | | pickaxe: plug diff filespec leak with empty needle | René Scharfe | 2011-10-07 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/no-cherry-pick-head-after-punted' | Junio C Hamano | 2011-10-19 | 2 | -7/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... | Junio C Hamano | 2011-10-06 | 2 | -7/+31 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-punted | Jay Soffian | 2011-10-06 | 1 | -5/+7 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | Jay Soffian | 2011-10-06 | 2 | -2/+24 | |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bk/submodule-in-recursive-merge' | Junio C Hamano | 2011-10-19 | 4 | -4/+61 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 | 4 | -5/+11 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | submodule: Demonstrate known breakage during recursive merge | Brad King | 2011-10-13 | 1 | -0/+51 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' | Junio C Hamano | 2011-10-19 | 2 | -0/+46 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 | 2 | -0/+46 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-19 | 1 | -12/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | t1300: attempting to remove a non-existent .git/config is not an error | Johannes Sixt | 2011-10-19 | 1 | -12/+7 | |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |