Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-p4: add submit --conflict option and config varaiable | Pete Wyckoff | 2012-09-16 | 3 | -5/+105 |
* | git p4: add submit --prepare-p4-only option | Pete Wyckoff | 2012-09-16 | 3 | -0/+77 |
* | git p4: add submit --dry-run option | Pete Wyckoff | 2012-09-16 | 3 | -13/+75 |
* | git p4: accept -v for --verbose | Pete Wyckoff | 2012-09-16 | 2 | -2/+2 |
* | git p4: revert deleted files after submit cancel | Pete Wyckoff | 2012-09-16 | 2 | -0/+121 |
* | git p4: rearrange submit template construction | Pete Wyckoff | 2012-09-16 | 1 | -8/+21 |
* | git p4: test clean-up after failed submit, fix added files | Pete Wyckoff | 2012-09-16 | 2 | -2/+132 |
* | git p4: standardize submit cancel due to unchanged template | Pete Wyckoff | 2012-09-16 | 2 | -2/+4 |
* | git p4: move conflict prompt into run, add [q]uit input | Pete Wyckoff | 2012-09-16 | 2 | -16/+56 |
* | git p4: remove submit failure options [a]pply and [w]rite | Pete Wyckoff | 2012-09-16 | 1 | -18/+2 |
* | git p4: gracefully fail if some commits could not be applied | Pete Wyckoff | 2012-09-16 | 3 | -56/+128 |
* | git p4 test: remove bash-ism of combined export/assignment | Pete Wyckoff | 2012-09-16 | 1 | -3/+4 |
* | Git 1.7.12-rc3v1.7.12-rc3 | Junio C Hamano | 2012-08-15 | 2 | -11/+2 |
* | Sync with 1.7.11.5 | Junio C Hamano | 2012-08-15 | 2 | -1/+10 |
|\ | |||||
| * | Git 1.7.11.5v1.7.11.5 | Junio C Hamano | 2012-08-15 | 3 | -2/+11 |
| * | Merge branch 'rj/maint-grep-remove-redundant-test' into maint | Junio C Hamano | 2012-08-15 | 1 | -11/+0 |
| |\ | |||||
| * \ | Merge branch 'hv/link-alt-odb-entry' into maint | Junio C Hamano | 2012-08-15 | 1 | -1/+1 |
| |\ \ | |||||
* | | | | git svn: reset invalidates the memoized mergeinfo caches | Peter Baumann | 2012-08-10 | 2 | -2/+103 |
* | | | | git svn: handle errors and concurrent commits in dcommit | Robert Luberda | 2012-08-10 | 2 | -19/+271 |
* | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2012-08-09 | 5 | -580/+1375 |
|\ \ \ \ | |||||
| * | | | | l10n: Update Swedish translation (1168t0f0u) | Peter Krefting | 2012-08-09 | 1 | -510/+903 |
| * | | | | Merge git://github.com/ralfth/git-po-de | Jiang Xin | 2012-08-08 | 1 | -46/+442 |
| |\ \ \ \ | |||||
| | * | | | | l10n: de.po: translate 77 new messages | Ralf Thielow | 2012-08-07 | 1 | -46/+442 |
| * | | | | | l10n: vi.po: update one message | Tran Ngoc Quan | 2012-08-07 | 1 | -9/+11 |
| * | | | | | l10n: zh_CN.po: update one translation | Jiang Xin | 2012-08-07 | 1 | -8/+10 |
| |/ / / / | |||||
| * | | | | l10n: Update one message in git.pot | Jiang Xin | 2012-08-06 | 1 | -7/+9 |
* | | | | | Merge branch 'bw/maint-1.7.9-solaris-getpass' | Junio C Hamano | 2012-08-08 | 2 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Enable HAVE_DEV_TTY for Solaris | Ben Walton | 2012-08-06 | 1 | -0/+1 |
| * | | | | | terminal: seek when switching between reading and writing | Jeff King | 2012-08-06 | 1 | -0/+1 |
* | | | | | | Documentation: list git-credential in plumbing commands | Matthieu Moy | 2012-08-08 | 2 | -1/+2 |
* | | | | | | Git 1.7.12-rc2v1.7.12-rc2 | Junio C Hamano | 2012-08-07 | 2 | -5/+1 |
* | | | | | | Drop 1.7.11.x items from 1.7.12 release notes | Junio C Hamano | 2012-08-06 | 1 | -13/+0 |
* | | | | | | Sync with maint | Junio C Hamano | 2012-08-06 | 1 | -0/+28 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Prepare for 1.7.11.5 | Junio C Hamano | 2012-08-06 | 2 | -1/+29 |
| * | | | | | Merge branch 'jn/block-sha1' into maint | Junio C Hamano | 2012-08-06 | 2 | -7/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jn/make-assembly-in-right-directory' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ms/daemon-doc-typo' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'lm/git-blame-el' into maint | Junio C Hamano | 2012-08-06 | 1 | -36/+37 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/ipv6-ssh-url' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rs/git-blame-mapcar-mapc' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rr/doc-commit' into maint | Junio C Hamano | 2012-08-06 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | doc: A few minor copy edits. | Štěpán Němec | 2012-08-06 | 5 | -10/+10 |
| * | | | | | | | | | | | | Merge branch 'jk/maint-checkout-orphan-check-fix' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/maint-revisions-doc' into maint | Junio C Hamano | 2012-08-06 | 1 | -6/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/mergetool-tool-help' into maint | Junio C Hamano | 2012-08-06 | 3 | -5/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | Makefile: use overridable $(FIND) instead of hard-coded 'find' | Johannes Sixt | 2012-08-06 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2012-08-05 | 3 | -449/+1265 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | l10n: zh_CN.po: translate 76 new messages | Jiang Xin | 2012-08-05 | 1 | -366/+451 |
| * | | | | | | | | | | | | | | | l10n: vi.po update to follow POT in 3b613 | Tran Ngoc Quan | 2012-08-03 | 1 | -44/+420 |
| * | | | | | | | | | | | | | | | l10n: Update git.pot (76 new, 4 removed messages) | Jiang Xin | 2012-08-02 | 1 | -39/+394 |